From 8c782759ef2ff01a5e125c05f998a3a678346455 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 8 Jun 2017 15:19:22 +0000
Subject: [PATCH] Bug 18752 - Automatic item modifications by age should allow
 'blank' values

This patch modifies the automatic item modification by age template to
correct errors in form validation:

- Age in days should not be required
- A value should not be required in substitutions.

To test, apply the patch and clear your browser cache if necessary.

- Go to Tools -> Automatic item modification by age.
- Confirm that when editing or creating a rule the only required field
  is the substitutions field name.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 1bc45a470e55bcbb5e4031c001749a1ec9b35160)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../tools/automatic_item_modification_by_age.tt      | 12 +++++-------
 .../prog/js/automatic_item_modification_by_age.js    |  1 -
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
index 946ad3a492..44aa3ff4b6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
@@ -85,8 +85,7 @@
                     <input type="hidden" name="unique_id" value="[% loop.count %]" /> <!-- FIXME on update, the unique_id should be filled -->
                     <div class="age">
                       <h5>Age in days</h5>
-                      <input class="age" required="required" type="number" value="[% rule.age %]" name="age_[% id %]" />
-                      <span class="required">Required</span>
+                      <input class="age" type="number" value="[% rule.age %]" name="age_[% id %]" />
                     </div>
                     <div class="blocks">
                       <h5>Conditions</h5>
@@ -124,10 +123,10 @@
                             [% END %]
                           </select>
                           =
-                          <input class="required" required="required" type="text" value="[% substitution.value %]" name="substitution_value_[% id %]" />
+                          <input type="text" value="[% substitution.value %]" name="substitution_value_[% id %]" />
                           <a class="add_block" href="#"><i class="fa fa-plus"></i> Add a substitution</a>
                           <a class="remove_block" href="#"><i class="fa fa-trash"></i> Remove substitution</a>
-                          <span class="required">Required</span>
+                          <span class="required">A field name is required</span>
                         </div>
                       [% END %]
                     </div>
@@ -148,7 +147,6 @@
             <div class="age">
               <h5>Age in days</h5>
               <input class="age" type="number" value="" name="age" />
-              <span class="required">Required</span>
             </div>
             <div class="blocks">
               <h5>Conditions</h5>
@@ -175,10 +173,10 @@
                   [% END %]
                 </select>
                 =
-                <input class="required" required="required" type="text" value="" name="substitution_value" />
+                <input type="text" value="" name="substitution_value" />
                 <a class="add_block" href="#"><i class="fa fa-plus"></i> Add a substitution</a>
                 <a class="remove_block" href="#"><i class="fa fa-trash"></i> Remove substitution</a>
-                <span class="required">Required</span>
+                <span class="required">A field name is required</span>
               </div>
             </div>
           </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/automatic_item_modification_by_age.js b/koha-tmpl/intranet-tmpl/prog/js/automatic_item_modification_by_age.js
index d14b55a3e4..6c37d9b210 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/automatic_item_modification_by_age.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/automatic_item_modification_by_age.js
@@ -117,7 +117,6 @@ $(document).ready(function() {
     });
 
     jQuery.validator.addClassRules("age", {
-        required: true,
         digits: true
     });
 
-- 
2.39.5