diff options
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'), ] |