equal
deleted
inserted
replaced
2 |
2 |
3 # Uncomment the next two lines to enable the admin: |
3 # Uncomment the next two lines to enable the admin: |
4 from django.contrib import admin |
4 from django.contrib import admin |
5 admin.autodiscover() |
5 admin.autodiscover() |
6 |
6 |
7 from pytask.taskapp.views.user import homepage, register, user_login, user_logout, view_my_profile, edit_my_profile |
7 from pytask.taskapp.views.user import homepage, register, user_login, user_logout, view_my_profile, edit_my_profile, browse_users |
8 from pytask.taskapp.views.task import browse_tasks, view_task, create_task, add_mentor, add_tasks, claim_task, assign_task |
8 from pytask.taskapp.views.task import browse_tasks, view_task, create_task, add_mentor, add_tasks, claim_task, assign_task |
9 |
9 |
10 urlpatterns = patterns('', |
10 urlpatterns = patterns('', |
11 # Example: |
11 # Example: |
12 # (r'^pytask/', include('pytask.foo.urls')), |
12 # (r'^pytask/', include('pytask.foo.urls')), |
31 (r'^accounts/login/$',user_login), |
31 (r'^accounts/login/$',user_login), |
32 (r'^accounts/logout/$',user_logout), |
32 (r'^accounts/logout/$',user_logout), |
33 |
33 |
34 (r'^user/view/uid=(\d+)$', view_my_profile), |
34 (r'^user/view/uid=(\d+)$', view_my_profile), |
35 (r'^user/edit/?$', edit_my_profile), |
35 (r'^user/edit/?$', edit_my_profile), |
36 |
36 (r'^user/browse/?$',browse_users), |
37 ) |
37 ) |