diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-21 21:11:48 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-21 21:11:48 +0200 |
| commit | af719ae697e5b03582b28f8a59eae39524cb8f7f (patch) | |
| tree | e106614f06c452a4b879104d6b745b7e710928c1 /archaeological_warehouse/views.py | |
| parent | 7ccc29e5c41fe8a4a33c803adc4bbbd94d6ad1d7 (diff) | |
| download | Ishtar-af719ae697e5b03582b28f8a59eae39524cb8f7f.tar.bz2 Ishtar-af719ae697e5b03582b28f8a59eae39524cb8f7f.zip | |
Djangoization - Major refactoring (step 13)
* Fix finds wizards
* Clean-up an unecessary file
Diffstat (limited to 'archaeological_warehouse/views.py')
| -rw-r--r-- | archaeological_warehouse/views.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py index f15220efe..10a7b9bf4 100644 --- a/archaeological_warehouse/views.py +++ b/archaeological_warehouse/views.py @@ -24,9 +24,10 @@ from django.http import HttpResponse from django.shortcuts import render_to_response from django.utils.translation import ugettext_lazy as _ -from ishtar_common.views import get_item, show_item, revert_item +from ishtar_common.views import get_item, new_item import models from wizards import * +from ishtar_common.forms import FinalForm from forms import * get_container = get_item(models.Container, @@ -37,8 +38,8 @@ get_container = get_item(models.Container, 'reference':'reference__icontains', }) -new_warehouse = new_item(models.Warehouse) -new_container = new_item(models.Container) +new_warehouse = new_item(models.Warehouse, WarehouseForm) +new_container = new_item(models.Container, ContainerForm) def autocomplete_warehouse(request): if not request.user.has_perm('ishtar_common.view_warehouse', @@ -86,9 +87,10 @@ def autocomplete_container(request): warehouse_packaging_wizard = PackagingWizard.as_view([ ('seleccontainer-packaging', ContainerFormSelection), ('base-packaging', BasePackagingForm), - ('multiselecitems-packaging', ItemPackagingFormSelection), + ('multiselecitems-packaging', FindPackagingFormSelection), ('final-packaging', FinalForm)], - url_name='warehouse_packaging',) + label=_(u"Packaging"), + url_name='warehouse_packaging',) """ warehouse_packaging_wizard = ItemSourceWizard.as_view([ |