From f31f0f269a68b2dfc5c834ce420bb5a02a3ecd0c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 21 Oct 2012 15:04:28 +0200 Subject: Djangoization - Major refactoring (step 8) * clean-up on request and storage args in methods * view creation now managed by South * clean some mess in session values by using MultiValueDict --- archaeological_warehouse/wizards.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'archaeological_warehouse') diff --git a/archaeological_warehouse/wizards.py b/archaeological_warehouse/wizards.py index 1e8455b94..06d3ec887 100644 --- a/archaeological_warehouse/wizards.py +++ b/archaeological_warehouse/wizards.py @@ -26,10 +26,10 @@ from archaeological_finds.models import Treatment class PackagingWizard(TreatmentWizard): - def save_model(self, dct, m2m, whole_associated_models, request, storage, - form_list, return_object): - dct = self.get_extra_model(dct, request, storage, form_list) - obj = self.get_current_saved_object(request, storage) + def save_model(self, dct, m2m, whole_associated_models, form_list, + return_object): + dct = self.get_extra_model(dct, form_list) + obj = self.get_current_saved_object() dct['location'] = dct['container'].location items = dct.pop('items') treatment = Treatment(**dct) @@ -37,12 +37,12 @@ class PackagingWizard(TreatmentWizard): if not hasattr(items, '__iter__'): items = [items] for item in items: - new = item.duplicate(request.user) + new = item.duplicate(self.request.user) item.downstream_treatment = treatment item.save() new.upstream_treatment = treatment new.container = dct['container'] new.save() res = render_to_response('wizard_done.html', {}, - context_instance=RequestContext(request)) + context_instance=RequestContext(self.request)) return return_object and (obj, res) or res -- cgit v1.2.3