diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-09-05 18:32:18 +0200 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-10-24 12:06:08 +0200 | 
| commit | 91bf33a99f49ac8e44ceb03f39548b7e3f69eee9 (patch) | |
| tree | b0efd83a6c1ec752f5ff29d5b258e31b33e7454d /archaeological_finds/forms.py | |
| parent | 93486b4c08af232d95fde4cff372ddaf8c290925 (diff) | |
| download | Ishtar-91bf33a99f49ac8e44ceb03f39548b7e3f69eee9.tar.bz2 Ishtar-91bf33a99f49ac8e44ceb03f39548b7e3f69eee9.zip | |
QA edit find: better management of fields
Diffstat (limited to 'archaeological_finds/forms.py')
| -rw-r--r-- | archaeological_finds/forms.py | 43 | 
1 files changed, 23 insertions, 20 deletions
| diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index a7fc0bc02..5fb77433e 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -316,12 +316,6 @@ class FindForm(CustomForm, ManageOldType):          return self.cleaned_data -QAHeaders = { -    'description': FormHeader(_(u"Description")), -    'checked_type': FormHeader(_(u"Sheet")) -} - -  class QAFindFormMulti(QAForm):      form_admin_name = _(u"Find - Quick action - Modify")      form_slug = "find-quickaction-modify" @@ -339,7 +333,28 @@ class QAFindFormMulti(QAForm):          'manufacturing_place', 'checked_type', 'check_date'      ] -    HEADERS = QAHeaders.copy() +    HEADERS = { +        'label': FormHeader(_(u"Identification")), +        'description': FormHeader(_(u"Description")), +        'checked_type': FormHeader(_(u"Sheet")) +    } + +    SINGLE_FIELDS = [ +        'label', 'denomination', 'previous_id', +        'get_first_base_find__excavation_id', 'museum_id', 'seal_number', +        'mark' +    ] + +    label = forms.CharField( +        label=_(u"Free ID"), +        validators=[validators.MaxLengthValidator(60)]) +    denomination = forms.CharField(label=_(u"Denomination"), required=False) +    previous_id = forms.CharField(label=_("Previous ID"), required=False) +    get_first_base_find__excavation_id = forms.CharField( +        label=_(u"Excavation ID"), required=False) +    museum_id = forms.CharField(label=_(u"Museum ID"), required=False) +    seal_number = forms.CharField(label=_(u"Seal number"), required=False) +    mark = forms.CharField(label=_(u"Mark"), required=False)      description = forms.CharField(label=_(u"Description"),                                    widget=forms.Textarea, required=False) @@ -381,21 +396,9 @@ class QAFindFormMulti(QAForm):  class QAFindFormSingle(QAFindFormMulti): +    MULTI = False      form_admin_name = _(u"Find - Quick action - Modify single")      form_slug = "find-quickaction-modifysingle" -    HEADERS = QAHeaders.copy() -    HEADERS['label'] = FormHeader(_(u"Identification")) - -    label = forms.CharField( -        label=_(u"Free ID"), -        validators=[validators.MaxLengthValidator(60)]) -    denomination = forms.CharField(label=_(u"Denomination"), required=False) -    previous_id = forms.CharField(label=_("Previous ID"), required=False) -    get_first_base_find__excavation_id = forms.CharField( -        label=_(u"Excavation ID"), required=False) -    museum_id = forms.CharField(label=_(u"Museum ID"), required=False) -    seal_number = forms.CharField(label=_(u"Seal number"), required=False) -    mark = forms.CharField(label=_(u"Mark"), required=False)      def __init__(self, *args, **kwargs):          super(QAFindFormSingle, self).__init__(*args, **kwargs) | 
