diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-04-08 18:06:26 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:20 +0100 |
| commit | 9be03de7917bb321119641b9d0063cd060d9b3c1 (patch) | |
| tree | 47c2df9adb1820c3993f1e50743dafcf86262e15 /archaeological_warehouse/urls.py | |
| parent | b2bb294b82a968b899a852f4fa64495e9cc2984f (diff) | |
| download | Ishtar-9be03de7917bb321119641b9d0063cd060d9b3c1.tar.bz2 Ishtar-9be03de7917bb321119641b9d0063cd060d9b3c1.zip | |
New container management - merge action
Diffstat (limited to 'archaeological_warehouse/urls.py')
| -rw-r--r-- | archaeological_warehouse/urls.py | 9 |
1 files changed, 9 insertions, 0 deletions
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'), ] |