diff options
| author | Nagarjuna G <nagarjun@gnowledge.org> | 2014-05-19 13:29:37 +0530 |
|---|---|---|
| committer | Nagarjuna G <nagarjun@gnowledge.org> | 2014-05-19 13:29:37 +0530 |
| commit | 9d154fbb3a139393a998688b5c0cdb03b70defbe (patch) | |
| tree | cfbb12027c9aa2a4740827cc448715a6cff0b933 /gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py | |
| parent | 2c3bb5b15d7fc260e7b6eb7df30f8de71fa47df4 (diff) | |
| parent | 874e070298b2d38b6608249c051d4bd1f97ced48 (diff) | |
| download | gnowsys-9d154fbb3a139393a998688b5c0cdb03b70defbe.tar.gz | |
Merge branch 'makfire-mongokit' into mongokit
Conflicts:
gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py
gnowsys-ndf/gnowsys_ndf/ndf/views/methods.py
gnowsys-ndf/gnowsys_ndf/ndf/views/page.py
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py')
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py index f8e52fb..6b0847a 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py @@ -5,16 +5,14 @@ urlpatterns = patterns('gnowsys_ndf.ndf.views.page', url(r'^/details/(?P<app_id>[\w-]+)$', 'page', name='page_details'), url(r'^/(?P<app_id>[\w-]+)$', 'page', name='page_details'), url(r'^/create/', 'create_edit_page', name='page_create_edit'), - 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'^/delete/(?P<node_id>[\w-]+)$', 'delete_page', name='page_delete'), 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'), ) |