From a62abdcb0c6daa71bc8bef293c20d911a63ccc60 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@proxience.com>
Date: Fri, 28 Nov 2014 11:30:02 +0100
Subject: Merge action implementation (person and organization)

---
 ishtar_common/urls.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ishtar_common/urls.py')

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:
-- 
cgit v1.2.3