diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-16 13:03:27 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-16 13:03:27 +0200 |
| commit | 6bb7d4cbf47c61fd168998a0423a31814eaa7fe0 (patch) | |
| tree | f0b7c63834d4fe9125d043893dad8765975a78b1 /archaeological_warehouse | |
| parent | 3748baac6501db293424d1ae5d092e8672a68f7f (diff) | |
| parent | 242c13fdc9895abdcd1af79bce2a9b3f98f3f939 (diff) | |
| download | Ishtar-6bb7d4cbf47c61fd168998a0423a31814eaa7fe0.tar.bz2 Ishtar-6bb7d4cbf47c61fd168998a0423a31814eaa7fe0.zip | |
Merge branch 'master-WIP-treatments'
Diffstat (limited to 'archaeological_warehouse')
| -rw-r--r-- | archaeological_warehouse/urls.py | 4 | ||||
| -rw-r--r-- | archaeological_warehouse/views.py | 2 | ||||
| -rw-r--r-- | archaeological_warehouse/wizards.py | 8 |
3 files changed, 3 insertions, 11 deletions
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 <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2010-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # 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<step>.+)?$', - # views.treatment_creation_wizard, name='treatment_creation'), url(r'warehouse_packaging/(?P<step>.+)?$', 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 <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2010-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # 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): |