diff options
Diffstat (limited to 'archaeological_files/urls.py')
| -rw-r--r-- | archaeological_files/urls.py | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/archaeological_files/urls.py b/archaeological_files/urls.py index 04a24d398..f00d618d6 100644 --- a/archaeological_files/urls.py +++ b/archaeological_files/urls.py @@ -17,16 +17,16 @@ # See the file COPYING for details. -from django.conf.urls import patterns, url +from django.conf.urls import url from ishtar_common.wizards import check_rights -import views +from archaeological_files import views +from archaeological_operations.views import administrativeactfile_document # be carreful: each check_rights must be relevant with ishtar_menu # forms: -urlpatterns = patterns( - '', +urlpatterns = [ url(r'file_administrativeactfil_search/(?P<step>.+)?$', check_rights(['change_administrativeact'])( views.file_administrativeactfile_search_wizard), @@ -65,33 +65,25 @@ urlpatterns = patterns( check_rights(['delete_file', 'delete_own_file'])( views.file_deletion_wizard), name='file_deletion'), -) - -urlpatterns += patterns( - 'archaeological_files.views', - url(r'autocomplete-file/$', 'autocomplete_file', + url(r'autocomplete-file/$', views.autocomplete_file, name='autocomplete-file'), - url(r'get-file/(?P<type>.+)?$', 'get_file', + url(r'get-file/(?P<type>.+)?$', views.get_file, name='get-file'), - url(r'get-file-full/(?P<type>.+)?$', 'get_file', + url(r'get-file-full/(?P<type>.+)?$', views.get_file, name='get-file-full', kwargs={'full': True}), url(r'get-file-shortcut/(?P<type>.+)?$', - 'get_file', name='get-file-shortcut', + views.get_file, name='get-file-shortcut', kwargs={'full': 'shortcut'}), url(r'get-administrativeactfile/(?P<type>.+)?$', - 'get_administrativeactfile', name='get-administrativeactfile'), - url(r'show-file(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_file', + views.get_administrativeactfile, name='get-administrativeactfile'), + url(r'show-file(?:/(?P<pk>.+))?/(?P<type>.+)?$', views.show_file, name='show-file'), url(r'show-historized-file/(?P<pk>.+)?/(?P<date>.+)?$', - 'show_file', name='show-historized-file'), + views.show_file, name='show-historized-file'), url(r'revert-file/(?P<pk>.+)/(?P<date>.+)$', - 'revert_file', name='revert-file'), - url(r'dashboard_file/$', 'dashboard_file', name='dashboard-file'), -) - -urlpatterns += patterns( - 'archaeological_operations.views', + views.revert_file, name='revert-file'), + url(r'dashboard_file/$', views.dashboard_file, name='dashboard-file'), url(r'file_administrativeact_document/$', - 'administrativeactfile_document', + administrativeactfile_document, name='file-administrativeact-document', kwargs={'file': True}), -) +] |