diff options
| author | admin <admin@krishna-K55VM.(none)> | 2015-01-31 19:18:03 +0530 |
|---|---|---|
| committer | admin <admin@krishna-K55VM.(none)> | 2015-01-31 19:18:03 +0530 |
| commit | b59e89402229b516a73e78f34c00e66c264247c7 (patch) | |
| tree | c488204932f17f78e7fdda05d59d3bd8bb9d3938 /gnowsys-ndf/gnowsys_ndf/ndf/urls/ajax-urls.py | |
| parent | fb2fea5a968c6ebfb0c52e580322d421c11a2a0c (diff) | |
| parent | b3ec0ea2ce9978c27a6fe5961993bde505fd6ffe (diff) | |
| download | gnowsys-b59e89402229b516a73e78f34c00e66c264247c7.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 6ce2bec..8ee9164 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'), |