diff options
| author | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-04-07 11:40:31 +0200 |
|---|---|---|
| committer | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-04-07 11:40:31 +0200 |
| commit | 7f22d3c20cc24debfe123425efa63ec5293e4b4c (patch) | |
| tree | f773b80964981c231c892ee5255b94285bc5620a /archaeological_finds/urls.py | |
| parent | 9127307734c85b816ac7dbb539b565ffb106d60f (diff) | |
| parent | da4af2ab5d105f6d2ce442b517e532b7570616e3 (diff) | |
| download | Ishtar-7f22d3c20cc24debfe123425efa63ec5293e4b4c.tar.bz2 Ishtar-7f22d3c20cc24debfe123425efa63ec5293e4b4c.zip | |
Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar
Conflicts:
archaeological_operations/templates/ishtar/sheet_operation.html
Diffstat (limited to 'archaeological_finds/urls.py')
| -rw-r--r-- | archaeological_finds/urls.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py index 9c554a124..9c331ccc9 100644 --- a/archaeological_finds/urls.py +++ b/archaeological_finds/urls.py @@ -24,7 +24,7 @@ import views from archaeological_finds import models -# be carreful: each check_rights must be relevant with ishtar_menu +# be careful: each check_rights must be relevant with ishtar_menu # forms urlpatterns = patterns( @@ -33,7 +33,7 @@ urlpatterns = patterns( check_rights(['view_find', 'view_own_find'])( views.find_search_wizard), name='find_search'), url(r'find_creation/(?P<step>.+)?$', - check_rights(['add_find'])( + check_rights(['add_find', 'add_own_find'])( views.find_creation_wizard), name='find_creation'), url(r'find_modification/(?P<step>.+)?$', check_rights(['change_find', 'change_own_find'])( @@ -284,6 +284,10 @@ urlpatterns += patterns( kwargs={'full': 'shortcut'}), url(r'^show-treatment(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_treatment', name=models.Treatment.SHOW_URL), + url(r'show-historized-treatment/(?P<pk>.+)?/(?P<date>.+)?$', + 'show_treatment', name='show-historized-treatment'), + url(r'^revert-treatment/(?P<pk>.+)/(?P<date>.+)$', + 'revert_treatment', name='revert-treatment'), url(r'get-treatmentfile/(?P<type>.+)?$', 'get_treatmentfile', name='get-treatmentfile'), url(r'get-treatmentfile-shortcut/(?P<type>.+)?$', @@ -292,6 +296,10 @@ urlpatterns += patterns( url(r'^show-treatmentfile(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_treatmentfile', name=models.TreatmentFile.SHOW_URL), + url(r'show-historized-treatmentfile/(?P<pk>.+)?/(?P<date>.+)?$', + 'show_treatmentfile', name='show-historized-treatmentfile'), + url(r'^revert-treatmentfile/(?P<pk>.+)/(?P<date>.+)$', + 'revert_treatmentfile', name='revert-treatmentfile'), # url(r'show-treatmentfile(?:/(?P<pk>.+))?/(?P<type>.+)?$', # 'show_treatmentfile', # name=models.TreatmentFile.SHOW_URL), |