diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-09-30 18:32:34 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-09-30 19:15:46 +0200 |
| commit | b6becbf6770dc30a88ef814effecd53b6c707da2 (patch) | |
| tree | 7566c425e647dd100783b190b207331f237b4b86 /archaeological_finds/forms.py | |
| parent | c0fe5367ac92a74e4af4a1994fb7443fbafb6c45 (diff) | |
| download | Ishtar-b6becbf6770dc30a88ef814effecd53b6c707da2.tar.bz2 Ishtar-b6becbf6770dc30a88ef814effecd53b6c707da2.zip | |
Archaeological finds: add a conservatory state field (refs #1303)
* added to models
* associated migration
* added to search
* added to forms
Diffstat (limited to 'archaeological_finds/forms.py')
| -rw-r--r-- | archaeological_finds/forms.py | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 26d180b04..41eeaef3b 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -50,7 +50,8 @@ class FindForm(forms.Form): file_upload = True form_label = _("Find") base_model = 'base_finds' - associated_models = {'material_type':models.MaterialType,} + associated_models = {'material_type':models.MaterialType, + 'conservatory_state':models.ConservatoryState} label = forms.CharField(label=_(u"ID"), validators=[validators.MaxLengthValidator(60)]) description = forms.CharField(label=_("Description"), @@ -58,6 +59,8 @@ class FindForm(forms.Form): base_finds__is_isolated = forms.NullBooleanField(label=_(u"Is isolated?"), required=False) material_type = forms.ChoiceField(label=_("Material type"), choices=[]) + conservatory_state = forms.ChoiceField(label=_(u"Conservatory state"), + choices=[], required=False) volume = FloatField(label=_(u"Volume (l)"), required=False) weight = FloatField(label=_(u"Weight (g)"), required=False) find_number = forms.IntegerField(label=_(u"Find number"), required=False) @@ -72,6 +75,10 @@ class FindForm(forms.Form): super(FindForm, self).__init__(*args, **kwargs) self.fields['material_type'].choices = models.MaterialType.get_types() self.fields['material_type'].help_text = models.MaterialType.get_help() + self.fields['conservatory_state'].choices = \ + models.ConservatoryState.get_types() + self.fields['conservatory_state'].help_text = \ + models.ConservatoryState.get_help() class DateForm(forms.Form): form_label = _("Dating") @@ -106,6 +113,8 @@ class FindSelect(TableSelect): dating__period = forms.ChoiceField(label=_(u"Period"), choices=[]) # TODO search by warehouse material_type = forms.ChoiceField(label=_(u"Material type"), choices=[]) + conservatory_state = forms.ChoiceField(label=_(u"Conservatory state"), + choices=[]) base_finds__find__description = forms.CharField(label=_(u"Description")) base_finds__is_isolated = forms.NullBooleanField(label=_(u"Is isolated?")) image = forms.NullBooleanField(label=_(u"Has an image?")) @@ -118,6 +127,10 @@ class FindSelect(TableSelect): models.MaterialType.get_types() self.fields['material_type'].help_text = \ models.MaterialType.get_help() + self.fields['conservatory_state'].choices = \ + models.ConservatoryState.get_types() + self.fields['conservatory_state'].help_text = \ + models.ConservatoryState.get_help() class FindFormSelection(forms.Form): form_label = _("Find search") |