From 05a15e46173ff8d2f4bb22e5c65b86bdfa2ed36e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 24 Jun 2016 20:45:12 +0200 Subject: Reactivate treatments --- archaeological_warehouse/urls.py | 4 +--- archaeological_warehouse/views.py | 2 +- archaeological_warehouse/wizards.py | 8 +------- 3 files changed, 3 insertions(+), 11 deletions(-) (limited to 'archaeological_warehouse') diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py index 58f594bcd..9094f0a91 100644 --- a/archaeological_warehouse/urls.py +++ b/archaeological_warehouse/urls.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2012 Étienne Loks +# Copyright (C) 2010-2016 Étienne Loks # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -27,8 +27,6 @@ import views # forms urlpatterns = patterns( '', - # url(r'treatment_creation/(?P.+)?$', - # views.treatment_creation_wizard, name='treatment_creation'), url(r'warehouse_packaging/(?P.+)?$', views.warehouse_packaging_wizard, name='warehouse_packaging'), ) diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py index be5e6150c..486c2a1e0 100644 --- a/archaeological_warehouse/views.py +++ b/archaeological_warehouse/views.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2012 Étienne Loks +# Copyright (C) 2010-2016 Étienne Loks # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/archaeological_warehouse/wizards.py b/archaeological_warehouse/wizards.py index 409f7b28f..62b441e00 100644 --- a/archaeological_warehouse/wizards.py +++ b/archaeological_warehouse/wizards.py @@ -25,13 +25,7 @@ from archaeological_finds.models import Treatment class PackagingWizard(TreatmentWizard): - - def get_form_kwargs(self, step): - kwargs = super(PackagingWizard, self).get_form_kwargs(step) - if 'base-packaging' not in step: - return kwargs - kwargs['user'] = self.request.user - return kwargs + basket_step = 'base-packaging' def save_model(self, dct, m2m, whole_associated_models, form_list, return_object): -- cgit v1.2.3