diff options
| -rw-r--r-- | archaeological_finds/models_finds.py | 4 | ||||
| -rw-r--r-- | ishtar_common/forms.py | 9 | ||||
| -rw-r--r-- | ishtar_common/models.py | 8 |
3 files changed, 12 insertions, 9 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 1dd56a82e..f4056cf4b 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1092,10 +1092,6 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, pgettext_lazy("key for text search", "last-modified-by"), 'history_modifier__ishtaruser__person__cached_label__icontains' ), - 'modified_since': - SearchAltName( - pgettext_lazy("key for text search", "modified-since"), - 'last_modified__gte'), 'history_creator': SearchAltName( pgettext_lazy("key for text search", "created-by"), diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py index dad2a300f..16edbdcd4 100644 --- a/ishtar_common/forms.py +++ b/ishtar_common/forms.py @@ -775,8 +775,11 @@ class HistorySelect(CustomForm, TableSelect): reverse_lazy('autocomplete-user'), associated_model=User), required=False ) - modified_since = forms.DateField( - label=_(u"Modified since"), widget=DatePicker, + modified_before = forms.DateField( + label=_("Modified before"), widget=DatePicker, + required=False) + modified_after = forms.DateField( + label=_("Modified after"), widget=DatePicker, required=False) _explicit_ordering = True @@ -784,7 +787,7 @@ class HistorySelect(CustomForm, TableSelect): super(HistorySelect, self).__init__(*args, **kwargs) field_order = self.fields.keys() current_fields = ["history_creator", "history_modifier", - "modified_since"] + "modified_before", "modified_after"] fields = OrderedDict() for k in field_order: if k in current_fields: diff --git a/ishtar_common/models.py b/ishtar_common/models.py index e07c8fe0e..e3a052a87 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2158,8 +2158,12 @@ class BaseHistorizedItem(StatisticItem, TemplateItem, FullSearch, Imported, pgettext_lazy("key for text search", u"modified-by"), 'history_modifier__ishtaruser__person__cached_label__iexact' ), - 'modified_since': SearchAltName( - pgettext_lazy("key for text search", u"modified-since"), + 'modified_before': SearchAltName( + pgettext_lazy("key for text search", "modified-before"), + 'last_modified__lte' + ), + 'modified_after': SearchAltName( + pgettext_lazy("key for text search", "modified-after"), 'last_modified__gte' ), } |