summaryrefslogtreecommitdiff
path: root/archaeological_operations/urls.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-01-10 01:18:28 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-01-10 01:18:28 +0100
commita95e41815be353f717e5a9347166e0bbc486c687 (patch)
treea4aec468c53ba6d5baa688df0dba3fbb8a588fb4 /archaeological_operations/urls.py
parent99f0621b864550817931a46850e5194f571c9d81 (diff)
parent7475ae571619c3726e63c5cefc0215930cb83278 (diff)
downloadIshtar-a95e41815be353f717e5a9347166e0bbc486c687.tar.bz2
Ishtar-a95e41815be353f717e5a9347166e0bbc486c687.zip
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'archaeological_operations/urls.py')
-rw-r--r--archaeological_operations/urls.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py
index aca98d4c4..e98ddc93f 100644
--- a/archaeological_operations/urls.py
+++ b/archaeological_operations/urls.py
@@ -128,9 +128,13 @@ urlpatterns += patterns(
# allow specialization for operations
url(r'show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$',
'show_administrativeact', name='show-administrativeactop'),
- # allow specialization for files
+ # allow specialization for files, treatment, treatment request
url(r'show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$',
'show_administrativeact', name='show-administrativeactfile'),
+ url(r'show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$',
+ 'show_administrativeact', name='show-administrativeacttreatment'),
+ url(r'show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$',
+ 'show_administrativeact', name='show-administrativeacttreatmentfile'),
url(r'generatedoc-administrativeactop/(?P<pk>.+)?/(?P<template_pk>.+)?$',
'generatedoc_administrativeactop',
name='generatedoc-administrativeactop'),