diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-09 20:06:04 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-09 20:06:04 +0200 |
| commit | 98be0595e88ba57e90793729a24e39b865a0695e (patch) | |
| tree | e56ef03b1e10781afb29039bfad06a977bf9ddf2 /archaeological_finds | |
| parent | 2d26023da0bc0929e748f3fa13deac12479003b9 (diff) | |
| download | Ishtar-98be0595e88ba57e90793729a24e39b865a0695e.tar.bz2 Ishtar-98be0595e88ba57e90793729a24e39b865a0695e.zip | |
Manage hierarchical display with select2
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/forms.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 8fe945e88..bdb602606 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -148,8 +148,7 @@ class FindForm(ManageOldType, forms.Form): is_complete = forms.NullBooleanField(label=_(u"Is complete?"), required=False) material_type = widgets.Select2MultipleField( - model=models.MaterialType, label=_(u"Material type"), required=False, - available=True + label=_(u"Material type"), required=False ) conservatory_state = forms.ChoiceField(label=_(u"Conservatory state"), choices=[], required=False) @@ -157,18 +156,17 @@ class FindForm(ManageOldType, forms.Form): label=_(u"Conservatory comment"), required=False, widget=forms.Textarea) object_type = widgets.Select2MultipleField( - model=models.ObjectType, label=_(u"Object types"), required=False, - available=True + label=_(u"Object types"), required=False, ) preservation_to_consider = forms.MultipleChoiceField( label=_(u"Preservation type"), choices=[], widget=widgets.Select2Multiple, required=False) integritie = forms.MultipleChoiceField( label=_(u"Integrity / interest"), choices=[], - widget=widgets.CheckboxSelectMultiple, required=False) + widget=widgets.Select2Multiple, required=False) remarkabilitie = forms.MultipleChoiceField( label=_(u"Remarkability"), choices=[], - widget=widgets.CheckboxSelectMultiple, required=False) + widget=widgets.Select2Multiple, required=False) get_first_base_find__topographic_localisation = forms.CharField( label=_(u"Point of topographic reference"), required=False, max_length=120 @@ -232,8 +230,18 @@ class FindForm(ManageOldType, forms.Form): self.fields[srs].help_text = \ SpatialReferenceSystem.get_help() self.fields['checked'].choices = models.CHECK_CHOICES + self.fields['material_type'].choices = models.MaterialType.get_types( + initial=self.init_data.get('material_type'), + empty_first=False + ) self.fields['material_type'].help_text = models.MaterialType.get_help() + self.fields['object_type'].choices = models.ObjectType.get_types( + initial=self.init_data.get('object_type'), + empty_first=False + ) + self.fields['object_type'].help_text = models.ObjectType.get_help() + self.fields['get_first_base_find__batch'].choices = \ models.BatchType.get_types( initial=self.init_data.get('get_first_base_find__batch')) |