diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-02-13 17:43:41 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-02-13 17:43:41 +0100 |
| commit | 0f9d91bb13a990e68b920e5d6449d4fad0772973 (patch) | |
| tree | b6ac510000a9087bef628914c33a498eb47244cb | |
| parent | da9baba079fd8ac3ca939c2a8e4f7fd889d9c0ca (diff) | |
| download | Ishtar-0f9d91bb13a990e68b920e5d6449d4fad0772973.tar.bz2 Ishtar-0f9d91bb13a990e68b920e5d6449d4fad0772973.zip | |
Search: add created before/after (refs #5188, refs #5189, refs #5191, refs #5192, refs #5193)
| -rw-r--r-- | ishtar_common/forms.py | 8 | ||||
| -rw-r--r-- | ishtar_common/models_common.py | 9 |
2 files changed, 17 insertions, 0 deletions
diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py index 2e15e907c..1497a97b9 100644 --- a/ishtar_common/forms.py +++ b/ishtar_common/forms.py @@ -927,6 +927,12 @@ 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 + ) history_modifier = forms.IntegerField( label=_("Last modified by"), widget=widgets.JQueryAutoComplete( @@ -945,6 +951,8 @@ class HistorySelect(CustomForm, TableSelect): CURRENT_FIELDS = [ "history_creator", + "created_before", + "created_after", "history_modifier", "modified_before", "modified_after", diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py index 2015a82da..bc078df1c 100644 --- a/ishtar_common/models_common.py +++ b/ishtar_common/models_common.py @@ -1464,6 +1464,8 @@ class BaseHistorizedItem( ) DATED_FIELDS = [ + "created__gte", + "created__lte", "last_modified__gte", "last_modified__lte", ] @@ -1479,6 +1481,13 @@ class BaseHistorizedItem( pgettext_lazy("key for text search", "modified-by"), "history_modifier__ishtaruser__person__cached_label__iexact", ), + "created_before": SearchAltName( + pgettext_lazy("key for text search", "created-before"), + "created__lte", + ), + "created_after": SearchAltName( + pgettext_lazy("key for text search", "created-after"), "created__gte" + ), "modified_before": SearchAltName( pgettext_lazy("key for text search", "modified-before"), "last_modified__lte", |