# HG changeset patch # User Madhusudan.C.S # Date 1294963184 -19800 # Node ID bb034741c351665650d53a4fe0265f011ccd4b68 # Parent c01504dc6c2c797be69aa25b2976c329e3329a56 Replace URL definition with the standard way of defining URLs. diff -r c01504dc6c2c -r bb034741c351 pytask/profile/urls.py --- a/pytask/profile/urls.py Fri Jan 14 22:53:18 2011 +0530 +++ b/pytask/profile/urls.py Fri Jan 14 05:29:44 2011 +0530 @@ -1,19 +1,13 @@ -from django.conf.urls.defaults import * +from django.conf.urls.defaults import patterns +from django.conf.urls.defaults import url -from pytask.profile.views import view_profile, edit_profile,\ - browse_notifications, view_notification,\ - delete_notification, unread_notification, \ - view_user - -urlpatterns = patterns('', - (r'^view/$', view_profile), - (r'^edit/$', edit_profile), - (r'^notf/browse/$', browse_notifications), - (r'^notf/view/nid=(\w+)$', view_notification), - (r'^notf/del/nid=(\w+)$', delete_notification), - (r'^notf/unr/nid=(\w+)$', unread_notification), - - (r'^user/view/uid=(\w+)$', view_user), +urlpatterns = patterns('pytask.profile.views', + url(r'^view/$', 'view_profile'), + url(r'^edit/$', 'edit_profile'), + url(r'^notf/browse/$', 'browse_notifications'), + url(r'^notf/view/nid=(\w+)$', 'view_notification'), + url(r'^notf/del/nid=(\w+)$', 'delete_notification'), + url(r'^notf/unr/nid=(\w+)$', 'unread_notification'), + url(r'^user/view/uid=(\w+)$', 'view_user'), ) - diff -r c01504dc6c2c -r bb034741c351 pytask/taskapp/urls.py --- a/pytask/taskapp/urls.py Fri Jan 14 22:53:18 2011 +0530 +++ b/pytask/taskapp/urls.py Fri Jan 14 05:29:44 2011 +0530 @@ -1,33 +1,25 @@ -from django.conf.urls.defaults import * +from django.conf.urls.defaults import patterns +from django.conf.urls.defaults import url -from pytask.taskapp.views import create_task, view_task, claim_task, \ - select_user, edit_task, create_textbook, view_textbook, \ - browse_tasks, edit_textbook, approve_task, approved_task,\ - browse_textbooks, approve_textbook, approved_textbook, addreviewer,\ - view_report, view_work, submit_report - -from pytask.views import under_construction - -urlpatterns = patterns('', - (r'^create/$', create_task), - (r'^edit/tid=(\w+)$', edit_task), - (r'^view/tid=(\w+)$', view_task), - (r'^claim/tid=(\w+)$', claim_task), - (r'^select/tid=(\w+)$', select_user), - (r'^approve/tid=(\w+)$', approve_task), - (r'^approved/tid=(\w+)$', approved_task), - (r'^addreviewer/tid=(\w+)$', addreviewer), - (r'^view/work/tid=(\w+)$', view_work), - (r'^view/report/rid=(\w+)$', view_report), - (r'^submit/report/tid=(\w+)$', submit_report), - (r'^browse/$', browse_tasks), +urlpatterns = patterns('pytask.taskapp.views', + url(r'^create/$', 'create_task'), + url(r'^edit/tid=(\w+)$', 'edit_task'), + url(r'^view/tid=(\w+)$', 'view_task'), + url(r'^claim/tid=(\w+)$', 'claim_task'), + url(r'^select/tid=(\w+)$', 'select_user'), + url(r'^approve/tid=(\w+)$', 'approve_task'), + url(r'^approved/tid=(\w+)$', 'approved_task'), + url(r'^addreviewer/tid=(\w+)$', 'addreviewer'), + url(r'^view/work/tid=(\w+)$', 'view_work'), + url(r'^view/report/rid=(\w+)$', 'view_report'), + url(r'^submit/report/tid=(\w+)$', 'submit_report'), + url(r'^browse/$', 'browse_tasks'), - (r'^textbook/create/$', create_textbook), - (r'^textbook/view/tid=(\w+)/$', view_textbook), - (r'^textbook/edit/tid=(\w+)/$', edit_textbook), - (r'^textbook/approve/tid=(\w+)/$', approve_textbook), - (r'^textbook/approved/tid=(\w+)/$', approved_textbook), - (r'^textbook/browse/$', browse_textbooks), + url(r'^textbook/create/$', 'create_textbook'), + url(r'^textbook/view/tid=(\w+)/$', 'view_textbook'), + url(r'^textbook/edit/tid=(\w+)/$', 'edit_textbook'), + url(r'^textbook/approve/tid=(\w+)/$', 'approve_textbook'), + url(r'^textbook/approved/tid=(\w+)/$', 'approved_textbook'), + url(r'^textbook/browse/$', 'browse_textbooks'), ) -