diff options
Diffstat (limited to 'ishtar_common/forms.py')
| -rw-r--r-- | ishtar_common/forms.py | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py index c59978730..ec2603bb9 100644 --- a/ishtar_common/forms.py +++ b/ishtar_common/forms.py @@ -958,11 +958,8 @@ class HistorySelect(CustomForm, TableSelect): ), required=False, ) - created_before = forms.DateField( - label=_("Created before"), widget=DatePicker, required=False - ) - created_after = forms.DateField( - label=_("Created after"), widget=DatePicker, required=False + created = forms.DateField( + label=_("Created"), widget=DatePicker, required=False ) history_modifier = forms.IntegerField( label=_("Last modified by"), @@ -971,22 +968,17 @@ class HistorySelect(CustomForm, TableSelect): ), required=False, ) - modified_before = forms.DateField( - label=_("Modified before"), widget=DatePicker, required=False - ) - modified_after = forms.DateField( - label=_("Modified after"), widget=DatePicker, required=False + modified = forms.DateField( + label=_("Modified"), widget=DatePicker, required=False ) locked = forms.NullBooleanField(label=_("Is locked?")) _explicit_ordering = True CURRENT_FIELDS = [ "history_creator", - "created_before", - "created_after", + "created", "history_modifier", - "modified_before", - "modified_after", + "modified", "locked", ] @@ -1370,16 +1362,14 @@ class GeoItemSelect(DocumentItemSelect): # all geo item can have documents geodata__data_type = forms.ChoiceField(label=_("Geo - Data type"), choices=[]) geodata__origin = forms.ChoiceField(label=_("Geo - Origin"), choices=[]) geodata__provider = forms.ChoiceField(label=_("Geo - Provider"), choices=[]) - geodata__z__gt = forms.FloatField(label=_("Geo - Z - higher than")) - geodata__z__lt = forms.FloatField(label=_("Geo - Z - lower than")) + geodata__z = forms.FloatField(label=_("Geo - Z")) geodata__comment = forms.CharField(label=_("Geo - Comment"), max_length=500) CURRENT_FIELDS = [ "geodata__name", "geodata__data_type", "geodata__origin", "geodata__provider", - "geodata__z__gt", - "geodata__z__lt", + "geodata__z", "geodata__comment", ] + DocumentItemSelect.CURRENT_FIELDS _explicit_ordering = True |