From 721cf51b30ed646f2073bc56aaf62ff1878aef94 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 8 Apr 2020 18:06:26 +0200
Subject: New container management - merge action

---
 archaeological_warehouse/urls.py | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'archaeological_warehouse/urls.py')

diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py
index 6519a5db4..5c08af2ad 100644
--- a/archaeological_warehouse/urls.py
+++ b/archaeological_warehouse/urls.py
@@ -103,4 +103,13 @@ urlpatterns = [
     url(r'^container-qa-lock/(?P<pks>[0-9-]+)?/$',
         views.QAContainerLockView.as_view(), name='container-qa-lock',
         kwargs={"model": models.Container}),
+
+    url(r'container-merge/(?:(?P<page>\d+)/)?$', views.container_merge,
+        name='container_merge'),
+    url(r'container-manual-merge/$',
+        views.ContainerManualMerge.as_view(),
+        name='container_manual_merge'),
+    url(r'container-manual-merge-items/(?P<pks>[0-9_]+?)/$',
+        views.ContainerManualMergeItems.as_view(),
+        name='container_manual_merge_items'),
 ]
-- 
cgit v1.2.3