summaryrefslogtreecommitdiff
path: root/ishtar_common/urls.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2014-05-26 20:54:16 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2014-05-26 20:54:16 +0200
commite50e6712077a7b4911672088838e203db41ffb80 (patch)
tree1e5f1f46e640673d701d74d7783335c4bb795b53 /ishtar_common/urls.py
parent01d3cdaacabcdca55bd08d67df5339ea5bfa92d7 (diff)
downloadIshtar-e50e6712077a7b4911672088838e203db41ffb80.tar.bz2
Ishtar-e50e6712077a7b4911672088838e203db41ffb80.zip
Contextual filter on fields for new items window (refs #1715)
Diffstat (limited to 'ishtar_common/urls.py')
-rw-r--r--ishtar_common/urls.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index 94e50d161..c46f555e9 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -65,7 +65,7 @@ urlpatterns += patterns('ishtar_common.views',
name='dashboard-main'),
url(r'update-current-item/$', 'update_current_item',
name='update-current-item'),
- url(r'new-person/(?P<parent_name>.+)?/$',
+ url(r'new-person/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',
'new_person', name='new-person'),
url(r'autocomplete-person(?:/([0-9_]+))?/(user)?$', 'autocomplete_person',
name='autocomplete-person'),
@@ -77,11 +77,11 @@ urlpatterns += patterns('ishtar_common.views',
name='autocomplete-town'),
url(r'autocomplete-department/?$', 'autocomplete_department',
name='autocomplete-department'),
- url(r'new-author/(?P<parent_name>.+)?/$',
+ url(r'new-author/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',
'new_author', name='new-author'),
url(r'autocomplete-author/$', 'autocomplete_author',
name='autocomplete-author'),
- url(r'new-organization/(?P<parent_name>.+)?/$',
+ url(r'new-organization/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',
'new_organization', name='new-organization'),
url(r'get-organization/(?P<type>.+)?$', 'get_organization',
name='get-organization'),