diff options
| -rw-r--r-- | archaeological_warehouse/ishtar_menu.py | 3 | ||||
| -rw-r--r-- | archaeological_warehouse/models.py | 1 | ||||
| -rw-r--r-- | archaeological_warehouse/urls.py | 4 | ||||
| -rw-r--r-- | archaeological_warehouse/views.py | 7 |
4 files changed, 15 insertions, 0 deletions
diff --git a/archaeological_warehouse/ishtar_menu.py b/archaeological_warehouse/ishtar_menu.py index 12b9feb0f..a44bbee1d 100644 --- a/archaeological_warehouse/ishtar_menu.py +++ b/archaeological_warehouse/ishtar_menu.py @@ -48,6 +48,9 @@ MENU_SECTIONS = [ SectionItem( 'containers', _(u"Containers"), childs=[ + MenuItem('container_search', _(u"Search"), + model=models.Warehouse, + access_controls=['change_warehouse',]), MenuItem('container_creation', _(u"Creation"), model=models.Warehouse, access_controls=['change_warehouse',]), diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 52752e4d0..656f516d5 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -148,6 +148,7 @@ class Container(LightHistorizedItem): COL_LABELS = { 'cached_location': _(u"Location - index"), 'divisions_lbl': _(u"Precise localisation"), + 'container_type__label': _(u"Type") } CACHED_LABELS = ['cached_label', 'cached_location'] diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py index a8c249bc1..4a3041ada 100644 --- a/archaeological_warehouse/urls.py +++ b/archaeological_warehouse/urls.py @@ -57,6 +57,10 @@ urlpatterns += patterns( check_rights(['change_warehouse'])( views.warehouse_modification_wizard), name='warehouse_modification'), + url(r'^container_search/(?P<step>.+)?$', + check_rights(['change_warehouse'])( + views.container_search_wizard), + name='container_search'), url(r'^container_creation/(?P<step>.+)?$', check_rights(['change_warehouse'])( views.container_creation_wizard), diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py index 3b2b72f64..5cf4ea345 100644 --- a/archaeological_warehouse/views.py +++ b/archaeological_warehouse/views.py @@ -26,6 +26,7 @@ from django.utils.translation import ugettext_lazy as _ import models from ishtar_common.views import get_item, new_item, show_item +from ishtar_common.wizards import SearchWizard from wizards import * from ishtar_common.forms import FinalForm from forms import * @@ -109,6 +110,12 @@ warehouse_modification_wizard = WarehouseModificationWizard.as_view([ url_name='warehouse_modification', ) +container_search_wizard = SearchWizard.as_view([ + ('selec-container_search', MainContainerFormSelection)], + label=_(u"Container search"), + url_name='container_search', +) + container_creation_wizard = ContainerWizard.as_view([ ('container-container_creation', ContainerForm), ('localisation-container_creation', LocalisationForm), |