diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2014-11-28 11:30:02 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2014-11-28 11:30:02 +0100 |
| commit | 1cc8d6156a79d8eff8d9f6ee82797df6e464408d (patch) | |
| tree | fc3cb300358ed90b4d08dac9a274bcc124dcec01 /ishtar_common/urls.py | |
| parent | 1094b07f381b658f8325c2723afa2e26b8909ebb (diff) | |
| download | Ishtar-1cc8d6156a79d8eff8d9f6ee82797df6e464408d.tar.bz2 Ishtar-1cc8d6156a79d8eff8d9f6ee82797df6e464408d.zip | |
Merge action implementation (person and organization)
Diffstat (limited to 'ishtar_common/urls.py')
| -rw-r--r-- | ishtar_common/urls.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py index c361ef438..d1e88f68f 100644 --- a/ishtar_common/urls.py +++ b/ishtar_common/urls.py @@ -93,8 +93,10 @@ urlpatterns += patterns('ishtar_common.views', 'autocomplete_organization', name='autocomplete-organization'), url(r'admin-globalvar/', views.GlobalVarEdit.as_view(), name='admin-globalvar'), - url(r'(?P<action_slug>' + actions + r')/$', 'action', - name='action'), + url(r'person_merge/(?:(?P<page>\d+)/)?$', 'person_merge', name='person_merge'), + url(r'organization_merge/(?:(?P<page>\d+)/)?$', 'organization_merge', + name='organization_merge'), + url(r'(?P<action_slug>' + actions + r')/$', 'action', name='action'), ) if settings.DEBUG: |