diff options
| author | admin <admin@krishna-K55VM.(none)> | 2015-03-17 19:26:15 +0530 |
|---|---|---|
| committer | admin <admin@krishna-K55VM.(none)> | 2015-03-17 19:26:15 +0530 |
| commit | ed419157e1cdd4d5e26ddc195fa745e358701869 (patch) | |
| tree | eb4b6f6399e1379618da84af2c885d5343b145ec /gnowsys-ndf/gnowsys_ndf/ndf/urls | |
| parent | d8c4689192522f1287672c93ff307f2fc2ecf601 (diff) | |
| download | gnowsys-ed419157e1cdd4d5e26ddc195fa745e358701869.tar.gz | |
version history is shifted to individual view
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls')
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py | 1 | ||||
| -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, 8 insertions, 3 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py index 30c0780..0901873 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py @@ -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'), + ) |