diff options
Diffstat (limited to 'ishtar_common/forms.py')
| -rw-r--r-- | ishtar_common/forms.py | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py index 16edbdcd4..939563334 100644 --- a/ishtar_common/forms.py +++ b/ishtar_common/forms.py @@ -782,23 +782,39 @@ class HistorySelect(CustomForm, TableSelect): label=_("Modified after"), widget=DatePicker, required=False) _explicit_ordering = True + CURRENT_FIELDS = ["history_creator", "history_modifier", + "modified_before", "modified_after"] def __init__(self, *args, **kwargs): super(HistorySelect, self).__init__(*args, **kwargs) field_order = self.fields.keys() - current_fields = ["history_creator", "history_modifier", - "modified_before", "modified_after"] fields = OrderedDict() for k in field_order: - if k in current_fields: + if k in self.CURRENT_FIELDS: continue fields[k] = self.fields[k] - for k in current_fields: + for k in self.CURRENT_FIELDS: fields[k] = self.fields[k] self.fields = fields self.custom_form_ordering() +class DocumentItemSelect(HistorySelect): + documents__image__isnull = forms.NullBooleanField(label=_("Has an image?")) + documents__associated_file__isnull = forms.NullBooleanField( + label=_("Has an attached file?")) + documents__associated_url__isnull = forms.NullBooleanField( + label=_("Has a web address?")) + CURRENT_FIELDS = [ + 'documents__image__isnull', + 'documents__associated_file__isnull', + 'documents__associated_url__isnull', + "history_creator", "history_modifier", + "modified_before", "modified_after" + ] + _explicit_ordering = True + + def get_now(): format = formats.get_format('DATE_INPUT_FORMATS')[0] value = datetime.datetime.now().strftime(format) @@ -1035,6 +1051,7 @@ class QAForm(CustomForm, ManageOldType): else: self._set_value(item, base_key) item.history_modifier = user + item._cached_label_checked = False item.save() |