diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-03-11 13:27:04 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-03-11 13:27:04 +0100 |
| commit | c9b07622ebf6f6dcceff3d6906d3ed33d74f24fd (patch) | |
| tree | c248b4e8b129d017373af2a07d399f5ca82717b1 /archaeological_finds/forms.py | |
| parent | df67b2c757e813512a6e5f1ea31f8a4693444013 (diff) | |
| download | Ishtar-c9b07622ebf6f6dcceff3d6906d3ed33d74f24fd.tar.bz2 Ishtar-c9b07622ebf6f6dcceff3d6906d3ed33d74f24fd.zip | |
Searc criteria: add has image/file/url criteria for all document items
Diffstat (limited to 'archaeological_finds/forms.py')
| -rw-r--r-- | archaeological_finds/forms.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 316253a7a..90805e656 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -56,7 +56,7 @@ from ishtar_common import widgets from ishtar_common.forms import CustomForm, CustomFormSearch, FormSet, \ FloatField, reverse_lazy, TableSelect, get_now, FinalForm, \ ManageOldType, FieldType, IshtarForm, FormHeader, QAForm, HistorySelect, \ - MultiSearchForm, LockForm + MultiSearchForm, LockForm, DocumentItemSelect from ishtar_common.forms_common import get_town_field from ishtar_common.models import valid_id, valid_ids, get_current_profile, \ SpatialReferenceSystem, Area, OperationType, IshtarUser @@ -524,8 +524,8 @@ class ResultingFindsForm(CustomForm, ManageOldType): label=_(u"Prefix label for resulting finds"), validators=[validators.MaxLengthValidator(200)], help_text=_( - u'E.g.: with a prefix "item-", each resulting item will be named ' - u'"item-1", "item-2", "item-3"') + 'E.g.: with a prefix "item-", each resulting item will be named ' + '"item-1", "item-2", "item-3"') ) resultings_start_number = forms.IntegerField( label=_(u"Numbering starting from"), initial=1, min_value=0 @@ -908,9 +908,9 @@ DatingFormSet.form_admin_name = _(u"Find - 040 - Dating") DatingFormSet.form_slug = "find-040-dating" -class FindSelect(HistorySelect): +class FindSelect(DocumentItemSelect): _model = models.Find - form_admin_name = _(u"Find - 001 - Search") + form_admin_name = _("Find - 001 - Search") form_slug = "find-001-search" FORM_FILTERS = [ (_(u"Find origin"), [ @@ -1051,9 +1051,9 @@ class FindSelect(HistorySelect): reverse_lazy('autocomplete-materialtype'), associated_model=models.MaterialType), ) - material_type_quality = forms.ChoiceField(label=_(u"Material type quality"), + material_type_quality = forms.ChoiceField(label=_("Material type quality"), choices=[]) - material_comment = forms.CharField(label=_(u"Comment on the material")) + material_comment = forms.CharField(label=_("Comment on the material")) object_types = forms.IntegerField( label=_(u"Object type"), widget=widgets.JQueryAutoComplete( @@ -1182,7 +1182,6 @@ class FindSelect(HistorySelect): appraisal_date__before = forms.DateField( label=_(u"Appraisal date before"), widget=DatePicker) - documents__image__isnull = forms.NullBooleanField(label=_(u"Has an image?")) loan = forms.NullBooleanField(label=_(u"Loan?")) treatments_file_end_date = forms.DateField( label=_(u"Treatment file end date before"), widget=DatePicker |