diff options
Diffstat (limited to 'archaeological_warehouse/views.py')
| -rw-r--r-- | archaeological_warehouse/views.py | 31 | 
1 files changed, 26 insertions, 5 deletions
| diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py index 9b83fd829..83fd7f4e1 100644 --- a/archaeological_warehouse/views.py +++ b/archaeological_warehouse/views.py @@ -21,13 +21,26 @@ import json  from django.core.urlresolvers import reverse  from django.db.models import Q -from django.http import HttpResponse +from django.http import HttpResponse, Http404  from django.shortcuts import redirect  from django.utils.translation import ugettext_lazy as _ -from forms import * +from archaeological_warehouse import models + +from archaeological_warehouse.forms import WarehouseForm, ContainerForm, \ +    ContainerFormSelection, BasePackagingForm, WarehouseFormSelection, \ +    SelectedDivisionFormset, WarehouseDeletionForm, \ +    MainContainerFormSelection, ContainerModifyForm, LocalisationForm, \ +    ContainerDeletionForm +from ishtar_common.forms import FinalForm +  from ishtar_common.views_item import get_item, show_item, new_item -from wizards import * +from archaeological_finds.views import treatment_add + +from archaeological_warehouse.wizards import PackagingWizard, WarehouseSearch, \ +    WarehouseWizard, WarehouseModificationWizard, WarehouseDeletionWizard, \ +    ContainerSearch, ContainerWizard, ContainerModificationWizard, \ +    ContainerDeletionWizard  get_container = get_item(models.Container, 'get_container', 'container')  show_container = show_item(models.Container, 'container') @@ -95,10 +108,9 @@ def autocomplete_container(request):           for container in containers])      return HttpResponse(data, content_type='text/plain') -warehouse_packaging_wizard = PackagingWizard.as_view([ +warehouse_packaging_wizard = PackagingWizard.as_view([  # AFAC      ('seleccontainer-packaging', ContainerFormSelection),      ('base-packaging', BasePackagingForm), -    # ('multiselecitems-packaging', FindPackagingFormSelection),      ('final-packaging', FinalForm)],      label=_(u"Packaging"),      url_name='warehouse_packaging',) @@ -185,6 +197,15 @@ container_deletion_wizard = ContainerDeletionWizard.as_view([      label=_(u"Container deletion"),      url_name='container_deletion',) + +def container_treatment_add(request, pk, current_right=None): +    try: +        container = models.Container.objects.get(pk=pk) +    except models.Container.DoesNotExist: +        raise Http404() +    return treatment_add( +        request, ",".join([str(f.pk) for f in container.finds.all()])) +  """  warehouse_packaging_wizard = ItemSourceWizard.as_view([           ('selec-warehouse_packaging', ItemsSelection), | 
