diff options
| author | supriya <sp.sawant14@gmail.com> | 2015-03-24 14:41:11 +0530 |
|---|---|---|
| committer | supriya <sp.sawant14@gmail.com> | 2015-03-24 14:41:11 +0530 |
| commit | ae0e1320019d411175153ed390ebc8bda6a25060 (patch) | |
| tree | 4cfb1c7e79c079b757def04f5d6b466b3bf61452 /gnowsys-ndf/gnowsys_ndf/ndf/urls | |
| parent | 1e4d8a3ae3c92e84570084868d0c6f5643917ab7 (diff) | |
| parent | d13cb8ff57b6c3045450d08e86fcacfa417fcc66 (diff) | |
| download | gnowsys-ae0e1320019d411175153ed390ebc8bda6a25060.tar.gz | |
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls')
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py | 3 | ||||
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py | 3 | ||||
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/version.py | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py index d9c4a90..e7c4d6d 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py @@ -38,7 +38,7 @@ urlpatterns = patterns('', (r'^admin/', include(admin.site.urls)), # (r'^$', HomeRedirectView.as_view()), url(r'^$', homepage, {"group_id": "home"}, name="homepage"), - url(r'^welcome/?', landing_page, name="welcome"), + url(r'^welcome/?', landing_page, name="landing_page"), # all main apps (r'^(?P<group_id>[^/]+)/file', include('gnowsys_ndf.ndf.urls.file')), @@ -64,6 +64,7 @@ urlpatterns = patterns('', (r'^(?P<group_id>[^/]+)/event', include('gnowsys_ndf.ndf.urls.event')), (r'^(?P<group_id>[^/]+)/data-review', include('gnowsys_ndf.ndf.urls.data_review')), (r'^(?P<group_id>[^/]+)/observation', include('gnowsys_ndf.ndf.urls.observation')), + (r'^(?P<group_id>[^/]+)/compare', include('gnowsys_ndf.ndf.urls.version')), url(r'^(?P<group_id>[^/]+)/topic_details/(?P<app_Id>[\w-]+)', 'gnowsys_ndf.ndf.views.topics.topic_detail_view', name='topic_details'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py index 0b7a5e4..5ef5af5 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py @@ -8,10 +8,7 @@ urlpatterns = patterns('gnowsys_ndf.ndf.views.page', url(r'^/edit/(?P<node_id>[\w-]+)$', 'create_edit_page', name='page_create_edit'), url(r'^/search$', 'page', name='page_search'), url(r'^/(?P<node_id>[\w-]+)/translate/$', 'translate_node', name='node_translation'), - url(r'^/(?P<node_id>[\w-]+)/version/(?P<version_no>\d+\.\d+)$', 'version_node', name='node_version'), url(r'^/page_publish/(?P<node>[\w-]+)$','publish_page',name='publish_page'), - url(r'^(?P<node_id>[\w-]+)/merge/(?P<version_1>\d+\.\d+)/(?P<version_2>\d+\.\d+)$', 'merge_doc', name='merge_doc'), - url(r'^(?P<node_id>[\w-]+)/revert/(?P<version_1>\d+\.\d+)$', 'revert_doc', name='revert_doc'), url(r'^/delete/(?P<node_id>[\w-]+)$', 'delete_page', name='page_delete'), ) diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/version.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/version.py new file mode 100644 index 0000000..1ce983f --- /dev/null +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/version.py @@ -0,0 +1,7 @@ +from django.conf.urls import patterns, url + +urlpatterns = patterns('gnowsys_ndf.ndf.views.version', + url(r'^/(?P<node_id>[\w-]+)/version/(?P<version_no>\d+\.\d+)$', 'version_node', name='node_version'), + url(r'^(?P<node_id>[\w-]+)/merge/(?P<version_1>\d+\.\d+)/(?P<version_2>\d+\.\d+)$', 'merge_doc', name='merge_doc'), + url(r'^(?P<node_id>[\w-]+)/revert/(?P<version_1>\d+\.\d+)$', 'revert_doc', name='revert_doc'), + ) |