diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2016-01-10 15:35:51 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2016-01-10 15:35:51 +0100 |
| commit | 9de20f503852855b5dda8723693c5d156232d16d (patch) | |
| tree | 8d8e7c09faf179b2fed07878d1cf450a245a78d0 /archaeological_operations/urls.py | |
| parent | 5e0b683ccc3851a4092e4d459a43fb557299d47e (diff) | |
| parent | 23622f70dc4b6b544dcd99994e46ea20ff309777 (diff) | |
| download | Ishtar-9de20f503852855b5dda8723693c5d156232d16d.tar.bz2 Ishtar-9de20f503852855b5dda8723693c5d156232d16d.zip | |
Merge branch 'master' into master-land-planner-2999
Diffstat (limited to 'archaeological_operations/urls.py')
| -rw-r--r-- | archaeological_operations/urls.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py index 68ac0bad0..76723deab 100644 --- a/archaeological_operations/urls.py +++ b/archaeological_operations/urls.py @@ -21,6 +21,7 @@ from django.conf.urls.defaults import * from ishtar_common.wizards import check_rights import views +import models # be carreful: each check_rights must be relevant with ishtar_menu @@ -104,7 +105,7 @@ urlpatterns += patterns( url(r'revert-operation/(?P<pk>.+)/(?P<date>.+)$', 'revert_operation', name='revert-operation'), url(r'show-operation(?:/(?P<pk>.+))?/(?P<type>.+)?$', - 'show_operation', name='show-operation'), + 'show_operation', name=models.Operation.SHOW_URL), url(r'show-historized-operation/(?P<pk>.+)?/(?P<date>.+)?$', 'show_operation', name='show-historized-operation'), url(r'get-administrativeactop/(?P<type>.+)?$', @@ -125,6 +126,8 @@ urlpatterns += patterns( url(r'generatedoc-administrativeactop/(?P<pk>.+)?/(?P<template_pk>.+)?$', 'generatedoc_administrativeactop', name='generatedoc-administrativeactop'), + url(r'show-operationsource(?:/(?P<pk>.+))?/(?P<type>.+)?$', + 'show_operationsource', name=models.OperationSource.SHOW_URL), url(r'get-operationsource/(?P<type>.+)?$', 'get_operationsource', name='get-operationsource'), url(r'dashboard_operation/$', 'dashboard_operation', |