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 |
7 from pytask.taskapp.views.user import homepage, register, user_login, user_logout, view_my_profile, edit_my_profile |
8 from pytask.taskapp.views.task import browse_tasks, view_task, create_task, add_mentor, add_tasks, claim_task |
8 from pytask.taskapp.views.task import browse_tasks, view_task, create_task, add_mentor, add_tasks, claim_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')), |
14 # Uncomment the admin/doc line below and add 'django.contrib.admindocs' |
14 # Uncomment the admin/doc line below and add 'django.contrib.admindocs' |
15 # to INSTALLED_APPS to enable admin documentation: |
15 # to INSTALLED_APPS to enable admin documentation: |
16 # (r'^admin/doc/', include('django.contrib.admindocs.urls')), |
16 # (r'^admin/doc/', include('django.contrib.admindocs.urls')), |
17 |
17 |
18 (r'^$', homepage), |
18 (r'^$', homepage), |
|
19 |
19 (r'^task/browse/$', browse_tasks), |
20 (r'^task/browse/$', browse_tasks), |
20 (r'^task/view/tid=(\d+)$', view_task), |
21 (r'^task/view/tid=(\d+)$', view_task), |
21 (r'^task/create/$', create_task), |
22 (r'^task/create/$', create_task), |
22 (r'^task/addmentor/tid=(\d+)', add_mentor), |
23 (r'^task/addmentor/tid=(\d+)', add_mentor), |
23 (r'^task/addtasks/tid=(\d+)', add_tasks), |
24 (r'^task/addtasks/tid=(\d+)', add_tasks), |
25 |
26 |
26 (r'^admin/', include(admin.site.urls)), |
27 (r'^admin/', include(admin.site.urls)), |
27 |
28 |
28 (r'^accounts/register/$',register), |
29 (r'^accounts/register/$',register), |
29 (r'^accounts/login/$',user_login), |
30 (r'^accounts/login/$',user_login), |
30 (r'^accounts/logout/$',user_logout) |
31 (r'^accounts/logout/$',user_logout), |
|
32 |
|
33 (r'^user/view/uid=(\d+)$', view_my_profile), |
|
34 (r'^user/edit/?$',edit_my_profile), |
|
35 |
31 ) |
36 ) |