From 89dbf946703cd63cf0f14531c555ec3c9ae6a87e Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 12 Sep 2016 15:05:16 +0200
Subject: Manual merge action (refs #3176)

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

(limited to 'ishtar_common/urls.py')

diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index 049bcaf7b..27078dd9e 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -35,6 +35,8 @@ urlpatterns = patterns(
     url(r'^i18n/', include('django.conf.urls.i18n')),
     # General
     url(r'shortcut_menu/', views.shortcut_menu, name='shortcut-menu'),
+    url(r'display/(?P<item_type>\w+)/(?P<pk>\d+)/',
+        views.DisplayItemView.as_view(), name='display-item'),
     url(r'person_search/(?P<step>.+)?$',
         check_rights(['add_person'])(
             views.person_search_wizard), name='person_search'),
@@ -174,10 +176,21 @@ urlpatterns += patterns(
         'autocomplete_organization', name='autocomplete-organization'),
     url(r'admin-globalvar/', views.GlobalVarEdit.as_view(),
         name='admin-globalvar'),
-    url(r'person_merge/(?:(?P<page>\d+)/)?$', 'person_merge',
+    url(r'person-merge/(?:(?P<page>\d+)/)?$', 'person_merge',
         name='person_merge'),
-    url(r'organization_merge/(?:(?P<page>\d+)/)?$', 'organization_merge',
+    url(r'person-manual-merge/$',
+        views.PersonManualMerge.as_view(),
+        name='person_manual_merge'),
+    url(r'person-manual-merge-items/(?P<pks>[0-9_]+?)/$',
+        views.PersonManualMergeItems.as_view(),
+        name='person_manual_merge_items'),
+    url(r'organization-merge/(?:(?P<page>\d+)/)?$', 'organization_merge',
         name='organization_merge'),
+    url(r'orga-manual-merge/$', views.OrgaManualMerge.as_view(),
+        name='orga_manual_merge'),
+    url(r'orga-manual-merge-items/(?P<pks>[0-9_]+?)/$',
+        views.OrgaManualMergeItems.as_view(),
+        name='orga_manual_merge_items'),
     url(r'reset/$', 'reset_wizards', name='reset_wizards'),
     url(r'(?P<action_slug>' + actions + r')/$', 'action', name='action'),
 )
-- 
cgit v1.2.3