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 | 721cf51b30ed646f2073bc56aaf62ff1878aef94 (patch) | |
| tree | 47c2df9adb1820c3993f1e50743dafcf86262e15 /archaeological_warehouse/urls.py | |
| parent | 5c0a4d451ec653d76ae26c444da8c000460c9db6 (diff) | |
| download | Ishtar-721cf51b30ed646f2073bc56aaf62ff1878aef94.tar.bz2 Ishtar-721cf51b30ed646f2073bc56aaf62ff1878aef94.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'), ] |