diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-16 20:10:57 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-16 20:10:57 +0200 |
| commit | d4119bdffd893943263a82813f6b783fda0253dd (patch) | |
| tree | 8e2be9071d39542da68661a27bc402874314798a /archaeological_warehouse/wizards.py | |
| parent | a39f989e9c02bca9e4c3127fde855364f392e3a5 (diff) | |
| parent | 5e7cda4fe8902979dac8a8008908accb8f0bfab4 (diff) | |
| download | Ishtar-d4119bdffd893943263a82813f6b783fda0253dd.tar.bz2 Ishtar-d4119bdffd893943263a82813f6b783fda0253dd.zip | |
Merge branch 'master' into v0.9
Conflicts:
install/install.sh
Diffstat (limited to 'archaeological_warehouse/wizards.py')
| -rw-r--r-- | archaeological_warehouse/wizards.py | 8 |
1 files changed, 1 insertions, 7 deletions
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): |