QA edit find: better management of fields

3 files changed, 29 insertions, 22 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index a7fc0bc02..5fb77433e 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -316,12 +316,6 @@ class FindForm(CustomForm, ManageOldType):
         return self.cleaned_data
 
 
-QAHeaders = {
-    'description': FormHeader(_(u"Description")),
-    'checked_type': FormHeader(_(u"Sheet"))
-}
-
-
 class QAFindFormMulti(QAForm):
     form_admin_name = _(u"Find - Quick action - Modify")
     form_slug = "find-quickaction-modify"
@@ -339,7 +333,28 @@ class QAFindFormMulti(QAForm):
         'manufacturing_place', 'checked_type', 'check_date'
     ]
 
-    HEADERS = QAHeaders.copy()
+    HEADERS = {
+        'label': FormHeader(_(u"Identification")),
+        'description': FormHeader(_(u"Description")),
+        'checked_type': FormHeader(_(u"Sheet"))
+    }
+
+    SINGLE_FIELDS = [
+        'label', 'denomination', 'previous_id',
+        'get_first_base_find__excavation_id', 'museum_id', 'seal_number',
+        'mark'
+    ]
+
+    label = forms.CharField(
+        label=_(u"Free ID"),
+        validators=[validators.MaxLengthValidator(60)])
+    denomination = forms.CharField(label=_(u"Denomination"), required=False)
+    previous_id = forms.CharField(label=_("Previous ID"), required=False)
+    get_first_base_find__excavation_id = forms.CharField(
+        label=_(u"Excavation ID"), required=False)
+    museum_id = forms.CharField(label=_(u"Museum ID"), required=False)
+    seal_number = forms.CharField(label=_(u"Seal number"), required=False)
+    mark = forms.CharField(label=_(u"Mark"), required=False)
 
     description = forms.CharField(label=_(u"Description"),
                                   widget=forms.Textarea, required=False)
@@ -381,21 +396,9 @@ class QAFindFormMulti(QAForm):
 
 
 class QAFindFormSingle(QAFindFormMulti):
+    MULTI = False
     form_admin_name = _(u"Find - Quick action - Modify single")
     form_slug = "find-quickaction-modifysingle"
-    HEADERS = QAHeaders.copy()
-    HEADERS['label'] = FormHeader(_(u"Identification"))
-
-    label = forms.CharField(
-        label=_(u"Free ID"),
-        validators=[validators.MaxLengthValidator(60)])
-    denomination = forms.CharField(label=_(u"Denomination"), required=False)
-    previous_id = forms.CharField(label=_("Previous ID"), required=False)
-    get_first_base_find__excavation_id = forms.CharField(
-        label=_(u"Excavation ID"), required=False)
-    museum_id = forms.CharField(label=_(u"Museum ID"), required=False)
-    seal_number = forms.CharField(label=_(u"Seal number"), required=False)
-    mark = forms.CharField(label=_(u"Mark"), required=False)
 
     def __init__(self, *args, **kwargs):
         super(QAFindFormSingle, self).__init__(*args, **kwargs)
diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py
index 4300e9c36..106b68c14 100644
--- a/ishtar_common/forms.py
+++ b/ishtar_common/forms.py
@@ -642,11 +642,15 @@ class ManageOldType(IshtarForm):
 
 class QAForm(CustomForm, ManageOldType):
     MULTI = False
+    SINGLE_FIELDS = []
 
     def __init__(self, *args, **kwargs):
         self.items = kwargs.pop('items')
         super(QAForm, self).__init__(*args, **kwargs)
-        for k in self.fields:
+        for k in self.fields.keys():
+            if self.MULTI and k in self.SINGLE_FIELDS:
+                self.fields.pop(k)
+                continue
             if self.MULTI and k not in self.REPLACE_FIELDS:
                 self.fields[k].label = unicode(self.fields[k].label) + \
                                        unicode(u" - append to existing")
diff --git a/ishtar_common/templates/widgets/search_input.html b/ishtar_common/templates/widgets/search_input.html
index 0cdf74cc5..e63d067a9 100644
--- a/ishtar_common/templates/widgets/search_input.html
+++ b/ishtar_common/templates/widgets/search_input.html
@@ -2,7 +2,7 @@
     <input type="{{ widget.type }}" name="{{ widget.name }}"
            {% if widget.value != None %} value="{{ widget.value|stringformat:'s' }}"{% endif %}{% include "django/forms/widgets/attrs.html" %} />
     <span class="input-group-append">
-        <span class="input-group-text input-link"
+        <span class="input-group-text input-link bg-primary text-white"
               title="{% trans 'Search' %}"
               id="submit-search">
             <i class="fa fa-search" aria-hidden="true"></i>