Resolve conflicts with latest changes

1 files changed, 34 insertions, 30 deletions

diff --git a/yaksh/urls.py b/yaksh/urls.py
index 068df7a..5058340 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -18,7 +18,7 @@ urlpatterns = [
     url(r'^complete/$', views.complete),
     url(r'^complete/(?P<attempt_num>\d+)/(?P<questionpaper_id>\d+)/$',\
             views.complete),
-    url(r'^register/$', views.user_register),
+    url(r'^register/$', views.user_register, name="register"),
     url(r'^(?P<q_id>\d+)/check/$', views.check),
     url(r'^(?P<q_id>\d+)/check/(?P<attempt_num>\d+)/(?P<questionpaper_id>\d+)/$',\
             views.check),
@@ -29,54 +29,56 @@ urlpatterns = [
     url(r'^enroll_request/(?P<course_id>\d+)/$', views.enroll_request, name='enroll_request'),
     url(r'^self_enroll/(?P<course_id>\d+)/$', views.self_enroll, name='self_enroll'),
     url(r'^view_answerpaper/(?P<questionpaper_id>\d+)/$', views.view_answerpaper, name='view_answerpaper'),
-    url(r'^download/user_assignment/(?P<question_id>\d+)/(?P<user_id>\d+)/(?P<quiz_id>\d+)$',
-        views.download_assignment_file, name="download_user_assignment"),
     url(r'^manage/$', views.prof_manage, name='manage'),
-    url(r'^manage/addquestion/$', views.add_question),
-    url(r'^manage/addquestion/(?P<question_id>\d+)/$', views.add_question),
+    url(r'^manage/addquestion/$', views.add_question, name="add_question"),
+    url(r'^manage/addquestion/(?P<question_id>\d+)/$', views.add_question,
+                                        name="add_question"),
     url(r'^manage/addquiz/(?P<course_id>\d+)/$', views.add_quiz, name='add_quiz'),
     url(r'^manage/addquiz/(?P<course_id>\d+)/(?P<quiz_id>\d+)/$', views.add_quiz, name='edit_quiz'),
-    url(r'^manage/gradeuser/$', views.grade_user),
-    url(r'^manage/gradeuser/(?P<quiz_id>\d+)/$',views.grade_user),
-    url(r'^manage/gradeuser/(?P<quiz_id>\d+)/(?P<user_id>\d+)/$',views.grade_user),
-    url(r'^manage/gradeuser/(?P<quiz_id>\d+)/(?P<user_id>\d+)/(?P<attempt_number>\d+)/$',views.grade_user),
-    url(r'^manage/questions/$', views.show_all_questions),
-    url(r'^manage/monitor/$', views.monitor),
-    url(r'^manage/showquestionpapers/$', views.show_all_questionpapers),
-    url(r'^manage/showquestionpapers/(?P<questionpaper_id>\d+)/$',\
-                                                    views.show_all_questionpapers),
-    url(r'^manage/monitor/(?P<quiz_id>\d+)/$', views.monitor),
+    url(r'^manage/gradeuser/$', views.grade_user, name="grade_user"),
+    url(r'^manage/gradeuser/(?P<quiz_id>\d+)/$',views.grade_user, name="grade_user"),
+    url(r'^manage/gradeuser/(?P<quiz_id>\d+)/(?P<user_id>\d+)/$',
+            views.grade_user, name="grade_user"),
+    url(r'^manage/gradeuser/(?P<quiz_id>\d+)/(?P<user_id>\d+)/(?P<attempt_number>\d+)/$',
+            views.grade_user, name="grade_user"),
+    url(r'^manage/questions/$', views.show_all_questions, name="show_questions"),
+    url(r'^manage/monitor/$', views.monitor, name="monitor"),
+    url(r'^manage/monitor/(?P<quiz_id>\d+)/$', views.monitor, name="monitor"),
     url(r'^manage/user_data/(?P<user_id>\d+)/(?P<questionpaper_id>\d+)/$',
-        views.user_data),
+        views.user_data, name="user_data"),
     url(r'^manage/user_data/(?P<user_id>\d+)/$', views.user_data),
     url(r'^manage/quiz/designquestionpaper/(?P<quiz_id>\d+)/$', views.design_questionpaper,
         name='design_questionpaper'),
     url(r'^manage/designquestionpaper/(?P<quiz_id>\d+)/(?P<questionpaper_id>\d+)/$',
         views.design_questionpaper, name='designquestionpaper'),
     url(r'^manage/statistics/question/(?P<questionpaper_id>\d+)/$',
-        views.show_statistics),
+        views.show_statistics, name="show_statistics"),
     url(r'^manage/statistics/question/(?P<questionpaper_id>\d+)/(?P<attempt_number>\d+)/$',
-        views.show_statistics),
+        views.show_statistics, name="show_statistics"),
     url(r'^manage/monitor/download_csv/(?P<questionpaper_id>\d+)/$',
-        views.download_csv),
+        views.download_csv, name="download_csv"),
     url(r'^manage/duplicate_course/(?P<course_id>\d+)/$', views.duplicate_course,
         name='duplicate_course'),
     url(r'manage/courses/$', views.courses, name='courses'),
     url(r'manage/add_course/$', views.add_course, name='add_course'),
     url(r'manage/edit_course/(?P<course_id>\d+)$', views.add_course, name='edit_course'),
     url(r'manage/course_detail/(?P<course_id>\d+)/$', views.course_detail, name='course_detail'),
-    url(r'manage/enroll/(?P<course_id>\d+)/(?P<user_id>\d+)/$', views.enroll),
+    url(r'manage/enroll/(?P<course_id>\d+)/(?P<user_id>\d+)/$', views.enroll,
+            name="enroll_user"),
     url(r'manage/enroll/rejected/(?P<course_id>\d+)/(?P<user_id>\d+)/$',
         views.enroll, {'was_rejected': True}),
-    url(r'manage/reject/(?P<course_id>\d+)/(?P<user_id>\d+)/$', views.reject),
     url(r'manage/send_mail/(?P<course_id>\d+)/$', views.send_mail, name="send_mail"),
+    url(r'manage/reject/(?P<course_id>\d+)/(?P<user_id>\d+)/$', views.reject,
+            name="reject_user"),
     url(r'manage/enrolled/reject/(?P<course_id>\d+)/(?P<user_id>\d+)/$',
-        views.reject, {'was_enrolled': True}),
-    url(r'manage/toggle_status/(?P<course_id>\d+)/$', views.toggle_course_status),
-    url(r'^ajax/questions/filter/$', views.ajax_questions_filter),
+        views.reject, {'was_enrolled': True}, name="reject_user"),
+    url(r'manage/toggle_status/(?P<course_id>\d+)/$', views.toggle_course_status,
+            name="toggle_course_status"),
+    url(r'^ajax/questions/filter/$', views.ajax_questions_filter,
+                name="questions_filter"),
     url(r'^editprofile/$', views.edit_profile, name='edit_profile'),
     url(r'^viewprofile/$', views.view_profile, name='view_profile'),
-    url(r'^manage/enroll/(?P<course_id>\d+)/$', views.enroll),
+    url(r'^manage/enroll/(?P<course_id>\d+)/$', views.enroll, name="enroll_users"),
     url(r'manage/enroll/rejected/(?P<course_id>\d+)/$',
         views.enroll, {'was_rejected': True}),
     url(r'manage/enrolled/reject/(?P<course_id>\d+)/$',
@@ -84,8 +86,10 @@ urlpatterns = [
     url(r'^manage/searchteacher/(?P<course_id>\d+)/$', views.search_teacher),
     url(r'^manage/addteacher/(?P<course_id>\d+)/$', views.add_teacher, name='add_teacher'),
     url(r'^manage/remove_teachers/(?P<course_id>\d+)/$', views.remove_teachers, name='remove_teacher'),
-    url(r'^manage/download_questions/$', views.show_all_questions),
-    url(r'^manage/upload_questions/$', views.show_all_questions),
+    url(r'^manage/download_questions/$', views.show_all_questions,
+                        name="show_questions"),
+    url(r'^manage/upload_questions/$', views.show_all_questions,
+                        name="show_questions"),
     url(r'^manage/grader/$', views.grader, name='grader'),
     url(r'^manage/regrade/question/(?P<course_id>\d+)/(?P<question_id>\d+)/$',
             views.regrade, name='regrade'),
@@ -98,9 +102,9 @@ urlpatterns = [
     url(r'^manage/(?P<mode>[\w\-]+)/(?P<quiz_id>\d+)/$', views.test_quiz),
     url(r'^manage/create_demo_course/$', views.create_demo_course),
     url(r'^manage/courses/download_course_csv/(?P<course_id>\d+)/$',
-        views.download_course_csv),
+        views.download_course_csv, name="download_course_csv"),
     url(r'^manage/download/user_assignment/(?P<question_id>\d+)/(?P<user_id>\d+)/(?P<quiz_id>\d+)/$',
-        views.download_assignment_file),
+        views.download_assignment_file, name="download_user_assignment"),
     url(r'^manage/download/quiz_assignments/(?P<quiz_id>\d+)/$',
-        views.download_assignment_file)
+        views.download_assignment_file, name="download_quiz_assignment")
 ]