summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-01-21 18:36:42 +0100
committerÉtienne Loks <etienne.loks@proxience.com>2015-01-21 18:59:42 +0100
commit6cca7cf2d508cac6e8056a79f9b191bca206ed08 (patch)
treef0c743fe28de59a65e1be93e622bdf26e11e5d0a
parentfdbf01b7cdede140853fcb7cbfa6eb5e07eddac5 (diff)
downloadIshtar-6cca7cf2d508cac6e8056a79f9b191bca206ed08.tar.bz2
Ishtar-6cca7cf2d508cac6e8056a79f9b191bca206ed08.zip
Fix archeaological site new window
-rw-r--r--archaeological_operations/urls.py4
-rw-r--r--archaeological_operations/views.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py
index 17f232455..fcd85efb5 100644
--- a/archaeological_operations/urls.py
+++ b/archaeological_operations/urls.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2013 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -99,7 +99,7 @@ urlpatterns += patterns('archaeological_operations.views',
url(r'autocomplete-archaeologicalsite/$',
'autocomplete_archaeologicalsite',
name='autocomplete-archaeologicalsite'),
- url(r'new-archaeologicalsite/(?P<parent_name>.+)?/$',
+ url(r'new-archaeologicalsite/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',
'new_archaeologicalsite', name='new-archaeologicalsite'),
url(r'autocomplete-patriarche/$', 'autocomplete_patriarche',
name='autocomplete-patriarche'),
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index ba66a724a..b4e9d2a2f 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2014 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as