diff options
| author | admin <admin@krishna-K55VM.(none)> | 2015-01-26 16:57:43 +0530 |
|---|---|---|
| committer | admin <admin@krishna-K55VM.(none)> | 2015-01-26 16:57:43 +0530 |
| commit | bb26308137b293fd8c5542c0cb1410578cc77745 (patch) | |
| tree | e4672329b3596918ddb5cb599b540df31c106e38 /gnowsys-ndf/gnowsys_ndf/ndf/urls/ajax-urls.py | |
| parent | 561363a53feb59df0145494ad096710a94ad15c3 (diff) | |
| parent | 0c44f104250d8b27dd4b8caba29c88232992d40a (diff) | |
| download | gnowsys-bb26308137b293fd8c5542c0cb1410578cc77745.tar.gz | |
conflicts removed
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls/ajax-urls.py')
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/ajax-urls.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/ajax-urls.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/ajax-urls.py index 7041811..28a5008 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/ajax-urls.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/ajax-urls.py @@ -18,7 +18,7 @@ urlpatterns = patterns('gnowsys_ndf.ndf.views.ajax_views', 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'^get_contents/', 'get_topic_contents', name='get_topic_contents'), + url(r'^get_contents/', 'get_topic_contents', name='get_topic_contents'), url(r'^drawer/', 'drawer_widget', name='drawer_widget'), url(r'^search/', 'search_drawer', name='search_drawer'), url(r'^terms/', 'terms_list', name='terms_list'), @@ -56,6 +56,7 @@ urlpatterns = patterns('gnowsys_ndf.ndf.views.ajax_views', url(r'^get_students_for_approval/', 'get_students_for_approval', name='get_students_for_approval'), url(r'^approve_students/', 'approve_students', name='approve_students'), + url(r'^get_statewise_data/', 'get_statewise_data', name='get_statewise_data'), url(r'^get_college_wise_students_data/', 'get_college_wise_students_data', name='get_college_wise_students_data'), url(r'^rechedule_event/(?P<node>[\w-]+)$','reschedule_task',name='reschedule_task'), url(r'^set_user_link/', 'set_user_link', name='set_user_link'), |