From 2c07eef528c7ab69385e85e6e861839e502e4646 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 13 Sep 2018 12:33:50 +0200
Subject: QA packaging - fix date initialization

---
 archaeological_finds/forms_treatments.py                       |  5 ++++-
 .../templates/ishtar/forms/qa_find_treatment.html              | 10 ++++------
 archaeological_finds/views.py                                  |  1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'archaeological_finds')

diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py
index 364c22ed6..b09d234f0 100644
--- a/archaeological_finds/forms_treatments.py
+++ b/archaeological_finds/forms_treatments.py
@@ -288,7 +288,9 @@ class QAFindTreatmentForm(IshtarForm):
             associated_model=Container, new=True),
         validators=[valid_id(Container)])
     create_treatment = forms.BooleanField(
-        label=_(u"Create a treatment"), required=False)
+        label=_(u"Create a treatment"), required=False,
+        widget=widgets.CheckboxInput
+    )
     year = forms.IntegerField(
         label=_("Year"), initial=lambda: datetime.datetime.now().year,
         validators=[validators.MinValueValidator(1000),
@@ -309,6 +311,7 @@ class QAFindTreatmentForm(IshtarForm):
         validators=[valid_id(Organization)], required=False)
 
     def __init__(self, *args, **kwargs):
+        self.confirm = False
         self.user = None
         if 'user' in kwargs:
             self.user = kwargs.pop('user')
diff --git a/archaeological_finds/templates/ishtar/forms/qa_find_treatment.html b/archaeological_finds/templates/ishtar/forms/qa_find_treatment.html
index 07f633848..ef3906735 100644
--- a/archaeological_finds/templates/ishtar/forms/qa_find_treatment.html
+++ b/archaeological_finds/templates/ishtar/forms/qa_find_treatment.html
@@ -27,10 +27,8 @@
     </div>
 
     <div class="form-row">
-        <input type="checkbox" name="create_treatment"
-               id="create-choice">&nbsp;
-        <label for="create-choice">
-            {% trans "Associate a treatment to this operation" %}
+        {{ form.create_treatment }}&nbsp;<label for="{{form.create_treatment.auto_id}}">
+            {% trans "Associate a treatment" %}
         </label>
     </div>
     <div id="new-treatment">
@@ -48,7 +46,7 @@
 
 {% block js %}
 var update_form_display = function(){
-    if ($("#create-choice:checked").length){
+    if ($("#{{form.create_treatment.auto_id}}:checked").length){
         $("#new-treatment").show();
     } else {
         $("#new-treatment").hide();
@@ -56,7 +54,7 @@ var update_form_display = function(){
 }
 
 $(document).ready(function(){
-    $("#create-choice").click(update_form_display);
+    $("#{{form.create_treatment.auto_id}}").click(update_form_display);
     update_form_display();
 });
 
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index 30a382e2c..e930c0830 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -633,6 +633,7 @@ class QAFindTreatmentFormView(QAItemForm):
     def get_form_kwargs(self):
         kwargs = super(QAFindTreatmentFormView, self).get_form_kwargs()
         kwargs['user'] = self.request.user
+        kwargs['prefix'] = "qa-packaging"
         return kwargs
 
     def form_valid(self, form):
-- 
cgit v1.2.3