diff options
author | supriya <sp.sawant14@gmail.com> | 2014-10-30 17:02:43 +0530 |
---|---|---|
committer | supriya <sp.sawant14@gmail.com> | 2014-10-30 17:02:43 +0530 |
commit | 1ecf3120fc6dbc1150cbdf37c9345422f9e0afcc (patch) | |
tree | 407100e53a9e7d7a14708f8e0ba31862d9b985ec /gnowsys-ndf/gnowsys_ndf/ndf/urls/ajax-urls.py | |
parent | d03f44f2058205e1dc275bcb5558658465676855 (diff) | |
parent | 88b69ce556b9146d95a6f3ae354b1cc4851c2457 (diff) | |
download | gnowsys-1ecf3120fc6dbc1150cbdf37c9345422f9e0afcc.tar.gz |
conflict resolved
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls/ajax-urls.py')
-rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/ajax-urls.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/ajax-urls.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/ajax-urls.py index d5f9174..066b74a 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/ajax-urls.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/ajax-urls.py @@ -17,6 +17,7 @@ urlpatterns = patterns('gnowsys_ndf.ndf.views.ajax_views', url(r'^deleteThemes/', 'delete_themes', name='delete_themes'), url(r'^add_Topics/', 'add_topics', name='add_topics'), url(r'^get_tree_hierarchy/(?P<node_id>[\w-]+)$', 'get_tree_hierarchy', name='get_tree_hierarchy'), + url(r'^get_collection/(?P<node_id>[\w-]+)$', 'get_collection', name='get_collection'), url(r'^drawer/', 'drawer_widget', name='drawer_widget'), url(r'^search/', 'search_drawer', name='search_drawer'), url(r'^terms/', 'terms_list', name='terms_list'), @@ -40,22 +41,22 @@ urlpatterns = patterns('gnowsys_ndf.ndf.views.ajax_views', url(r'^get_data_for_batch_drawer/', 'get_data_for_batch_drawer', name='get_data_for_batch_drawer'), # Ajax-urls required for MIS -------------------------------- - url(r'^get_announced_courses/', 'get_announced_courses', name='get_announced_courses'), + url(r'^get_anncourses_allstudents/', 'get_anncourses_allstudents', name='get_anncourses_allstudents'), - + url(r'^get_courses/', 'get_courses', name='get_courses'), + + url(r'^get_enroll_duration_of_ac/', 'get_enroll_duration_of_ac', name='get_enroll_duration_of_ac'), + url(r'^get_announced_courses_with_ctype/', 'get_announced_courses_with_ctype', name='get_announced_courses_with_ctype'), + url(r'^get_colleges/', 'get_colleges', name='get_colleges'), url(r'^get_districts/', 'get_districts', name='get_districts'), url(r'^get_affiliated_colleges/', 'get_affiliated_colleges', name='get_affiliated_colleges'), - url(r'^get_students/', 'get_students', name='get_students'), url(r'^get_college_wise_students_data/', 'get_college_wise_students_data', name='get_college_wise_students_data'), url(r'^set_user_link/', 'set_user_link', name='set_user_link'), url(r'^set_enrollment_code/', 'set_enrollment_code', name='set_enrollment_code'), url(r'^get_students_assignments/', 'get_students_assignments', name='get_students_assignments'), # =========================================================== - url(r'^edit_task_title/', 'edit_task_title', name='edit_task_title'), url(r'^edit_task_content/', 'edit_task_content', name='edit_task_content'), - - url(r'^insert_picture/', 'insert_picture', name="insert_picture"), ) |