From 81bfae93649a2f1a93f4722d052fc529c6495d71 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 10 Jun 2013 11:14:41 -0400
Subject: [PATCH] Bug 10297 - categorycode and branchcode should be required
 when adding patrons

categorycode and branchcode should show as required under all
circumstances, not just when they are included in the
BorrowerMandatoryField system preference. This patch adds the correct
classes and hints to those fields.

To test, view the patron entry form for a new or existing patron.
Category and Library should show that they are required.

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 .../prog/en/modules/members/memberentrygen.tt      | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 6b293f116a..1bb8e3e752 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -989,13 +989,8 @@
         [% END %]
         [% UNLESS nobranchcode %]
     <li>
-      [%- IF ( mandatorybranchcode ) -%]
-        <label for="branchcode" class="required">
-      [%- ELSE -%]
-        <label for="branchcode">
-      [%- END -%]
-      Library:</label>
-      <select name="branchcode" size="1" id="branchcode">
+        <label for="branchcode" class="required">Library:</label>
+        <select name="branchcode" size="1" id="branchcode">
         [%- FOREACH branchloo IN branchloop %]
           [% IF ( branchloo.selected ) -%]
             <option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
@@ -1004,13 +999,11 @@
           [%- END -%]
         [%- END %]
       </select>
-      [% IF ( mandatorybranchcode ) -%]
       <span class="required">Required</span>
-      [%- END %]
     </li>
         [% END %]
     <li>
-        <label for="categorycode">Category: </label>
+        <label for="categorycode" class="required">Category: </label>
         <select id="categorycode" name="categorycode" onchange="update_category_code(this);">
         [% FOREACH typeloo IN typeloop %]
             [% FOREACH categoryloo IN typeloo.categoryloop %]
@@ -1033,6 +1026,7 @@
             [% END %]
        [% END %]
        </select>
+       <span class="required">Required</span>
     </li>
         [% UNLESS nosort1 %]
     <li>
-- 
2.20.1