Find: search last modified and modified by

1 files changed, 26 insertions, 0 deletions

diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py
index 34a50c0dd..7fed8b1c2 100644
--- a/ishtar_common/forms.py
+++ b/ishtar_common/forms.py
@@ -26,6 +26,7 @@ import re
 import types
 
 from django import forms
+from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.core.urlresolvers import reverse
 from django.core import validators
@@ -512,6 +513,31 @@ class TableSelect(IshtarForm):
         return self.fields.keys()
 
 
+class HistorySelect(CustomForm, TableSelect):
+    history_modifier = forms.IntegerField(
+        label=_(u"Last modified by"),
+        widget=widgets.JQueryAutoComplete(
+            reverse_lazy('autocomplete-user'),
+            associated_model=User), required=False
+    )
+    modified_since = forms.DateField(
+        label=_(u"Modified since"), widget=DatePicker,
+        required=False)
+
+    def __init__(self, *args, **kwargs):
+        super(HistorySelect, self).__init__(*args, **kwargs)
+        field_order = self.fields.keys()
+        current_fields = ["history_modifier", "modified_since"]
+        fields = OrderedDict()
+        for k in field_order:
+            if k in current_fields:
+                continue
+            fields[k] = self.fields[k]
+        for k in current_fields:
+            fields[k] = self.fields[k]
+        self.fields = fields
+
+
 def get_now():
     format = formats.get_format('DATE_INPUT_FORMATS')[0]
     value = datetime.datetime.now().strftime(format)