diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
| commit | c0f14049777002bf0849f04dabc99a6bc66de295 (patch) | |
| tree | 777c2f1bcfc1cde0056a64b04d0ee322948ade56 /archaeological_files/urls.py | |
| parent | 229a5559e9933ea76020963ca3778906d39279d4 (diff) | |
| parent | 1191cb323ca087ea05d5f58acb555b8e2d266801 (diff) | |
| download | Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.tar.bz2 Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.zip | |
Merge branch 'master' into v0.9
Conflicts:
archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py
Diffstat (limited to 'archaeological_files/urls.py')
| -rw-r--r-- | archaeological_files/urls.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/archaeological_files/urls.py b/archaeological_files/urls.py index b762a54b3..110851f80 100644 --- a/archaeological_files/urls.py +++ b/archaeological_files/urls.py @@ -50,14 +50,14 @@ urlpatterns = patterns( check_rights(['view_file', 'view_own_file'])( views.file_search_wizard), name='file_search'), - url(r'file_creation/(?P<step>.+)?$', + url(r'^file_creation/(?P<step>.+)?$', check_rights(['add_file'])( views.file_creation_wizard), name='file_creation'), - url(r'file_modification/(?P<step>.+)?$', + url(r'^file_modification/(?P<step>.+)?$', check_rights(['change_file', 'change_own_file'])( views.file_modification_wizard), name='file_modification'), - url(r'file_modify/(?P<pk>.+)/$', views.file_modify, name='file_modify'), - url(r'file_closing/(?P<step>.+)?$', + url(r'^file_modify/(?P<pk>.+)/$', views.file_modify, name='file_modify'), + url(r'^file_closing/(?P<step>.+)?$', check_rights(['change_file'])( views.file_closing_wizard), name='file_closing'), @@ -93,5 +93,5 @@ urlpatterns += patterns( 'archaeological_operations.views', url(r'file_administrativeact_document/$', 'administrativeactfile_document', - name='file-administrativeact-document', kwargs={'operation': False}), + name='file-administrativeact-document', kwargs={'file': True}), ) |