summaryrefslogtreecommitdiff
path: root/archaeological_warehouse
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-08-22 16:59:00 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-08-22 16:59:00 +0200
commitf88edd03db806b846ad10c68279a1a7c4902f3ee (patch)
tree608a87900972a8d227dabd864a669bd8bc1c633b /archaeological_warehouse
parent0daa90c284b5829d42974a8c9f3fbae9bf8fcf28 (diff)
downloadIshtar-f88edd03db806b846ad10c68279a1a7c4902f3ee.tar.bz2
Ishtar-f88edd03db806b846ad10c68279a1a7c4902f3ee.zip
Bookmark: manage missing bookmark configuration
Diffstat (limited to 'archaeological_warehouse')
-rw-r--r--archaeological_warehouse/views.py5
-rw-r--r--archaeological_warehouse/wizards.py10
2 files changed, 11 insertions, 4 deletions
diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py
index ec160cbce..a1b1ffbe2 100644
--- a/archaeological_warehouse/views.py
+++ b/archaeological_warehouse/views.py
@@ -27,7 +27,6 @@ from django.utils.translation import ugettext_lazy as _
from forms import *
from ishtar_common.views_item import get_item, show_item, new_item
-from ishtar_common.wizards import SearchWizard
from wizards import *
get_container = get_item(models.Container, 'get_container', 'container')
@@ -92,7 +91,7 @@ warehouse_packaging_wizard = PackagingWizard.as_view([
label=_(u"Packaging"),
url_name='warehouse_packaging',)
-warehouse_search_wizard = SearchWizard.as_view([
+warehouse_search_wizard = WarehouseSearch.as_view([
('selec-warehouse_search', WarehouseFormSelection)],
label=_(u"Warehouse search"),
url_name='warehouse_search',
@@ -134,7 +133,7 @@ warehouse_deletion_wizard = WarehouseDeletionWizard.as_view([
label=_(u"Warehouse deletion"),
url_name='warehouse_deletion',)
-container_search_wizard = SearchWizard.as_view([
+container_search_wizard = ContainerWizard.as_view([
('selec-container_search', MainContainerFormSelection)],
label=_(u"Container search"),
url_name='container_search',
diff --git a/archaeological_warehouse/wizards.py b/archaeological_warehouse/wizards.py
index 6678e6c36..41c5c5945 100644
--- a/archaeological_warehouse/wizards.py
+++ b/archaeological_warehouse/wizards.py
@@ -20,13 +20,21 @@
from django.shortcuts import render
from ishtar_common.forms import reverse_lazy
-from ishtar_common.wizards import Wizard, DeletionWizard
+from ishtar_common.wizards import Wizard, DeletionWizard, SearchWizard
from archaeological_finds.wizards import TreatmentWizard
from archaeological_finds.models import Treatment, TreatmentType
import models
+class WarehouseSearch(SearchWizard):
+ model = models.Warehouse
+
+
+class ContainerSearch(SearchWizard):
+ model = models.Container
+
+
class PackagingWizard(TreatmentWizard):
basket_step = 'base-packaging'