diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-12-04 01:06:31 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-12-04 01:06:31 +0100 |
| commit | 0e06d013b01247127d8666c1533689537a725752 (patch) | |
| tree | 4078f8bd4cfda4b6cdfd017ba1e5a5bfc195c78a /archaeological_finds/views.py | |
| parent | 7e060ac1a352ec2c290732988d8e3bacbb204c86 (diff) | |
| download | Ishtar-0e06d013b01247127d8666c1533689537a725752.tar.bz2 Ishtar-0e06d013b01247127d8666c1533689537a725752.zip | |
Treatment: manage treatment with baskets
Diffstat (limited to 'archaeological_finds/views.py')
| -rw-r--r-- | archaeological_finds/views.py | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 1f3213504..29d4f7da9 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -292,8 +292,9 @@ get_downstreamtreatment = get_item( treatment_wizard_steps = [ ('basetreatment-treatment_creation', BaseTreatmentForm), ('selecfind-treatment_creation', UpstreamFindFormSelection), - ('resultfind-treatment_creation', ResultFindForm), - ('resultfinds-treatment_creation', ResultFindFormSet), + ('selecbasket-treatment_creation', SelectFindBasketForm), + # ('resultfind-treatment_creation', ResultFindForm), + # ('resultfinds-treatment_creation', ResultFindFormSet), ('final-treatment_creation', FinalForm)] treatment_search_wizard = SearchWizard.as_view([ @@ -305,16 +306,20 @@ treatment_creation_wizard = TreatmentWizard.as_view( treatment_wizard_steps, condition_dict={ 'selecfind-treatment_creation': - check_not_exist('basetreatment-treatment_creation', - 'basket'), - 'resultfinds-treatment_creation': - check_type_field('basetreatment-treatment_creation', - 'treatment_type', models.TreatmentType, - 'downstream_is_many'), - 'resultfind-treatment_creation': - check_type_field('basetreatment-treatment_creation', - 'treatment_type', models.TreatmentType, - 'upstream_is_many')}, + check_value('basetreatment-treatment_creation', + 'target_is_basket', False), + 'selecbasket-treatment_creation': + check_value('basetreatment-treatment_creation', + 'target_is_basket', True), + # 'resultfinds-treatment_creation': + # check_type_field('basetreatment-treatment_creation', + # 'treatment_type', models.TreatmentType, + # 'downstream_is_many'), + # 'resultfind-treatment_creation': + # check_type_field('basetreatment-treatment_creation', + # 'treatment_type', models.TreatmentType, + # 'upstream_is_many') + }, label=_(u"New treatment"), url_name='treatment_creation',) |