Fix for Bug 5037 - If patron category is empty it shouldn't show

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bbb0819f0f22b9387ddc209b7f0997c3b507b51d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index 2386e65..47df5ff 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -742,22 +742,26 @@
         <label for="categorycode">Category: </label>
         <select id="categorycode" name="categorycode">
         <!-- TMPL_LOOP NAME="typeloop" -->
-               <!-- TMPL_IF EXPR="typename eq 'C'" --><optgroup label="Child"><!-- /TMPL_IF -->
-               <!-- TMPL_IF EXPR="typename eq 'A'" --><optgroup label="Adult"><!-- /TMPL_IF -->
-               <!-- TMPL_IF EXPR="typename eq 'S'" --><optgroup label="Staff"><!-- /TMPL_IF -->
-               <!-- TMPL_IF EXPR="typename eq 'I'" --><optgroup label="Organization"><!-- /TMPL_IF -->
-               <!-- TMPL_IF EXPR="typename eq 'P'" --><optgroup label="Professional"><!-- /TMPL_IF -->
-               <!-- TMPL_IF EXPR="typename eq 'X'" --><optgroup label="Statistical"><!-- /TMPL_IF -->
-                <!-- TMPL_LOOP NAME="categoryloop" -->
+                       <!-- TMPL_LOOP NAME="categoryloop" -->
+                               <!-- TMPL_IF NAME="__first__" -->
+                                       <!-- TMPL_IF NAME="typename_C" --><optgroup label="Child"><!-- /TMPL_IF -->
+                                       <!-- TMPL_IF NAME="typename_A" --><optgroup label="Adult"><!-- /TMPL_IF -->
+                                       <!-- TMPL_IF NAME="typename_S" --><optgroup label="Staff"><!-- /TMPL_IF -->
+                                       <!-- TMPL_IF NAME="typename_I" --><optgroup label="Organization"><!-- /TMPL_IF -->
+                                       <!-- TMPL_IF NAME="typename_P" --><optgroup label="Professional"><!-- /TMPL_IF -->
+                                       <!-- TMPL_IF NAME="typename_X" --><optgroup label="Statistical"><!-- /TMPL_IF -->
+                           <!-- /TMPL_IF -->
                                <!-- TMPL_IF NAME="categorycodeselected" -->
                <option value="<!-- TMPL_VAR NAME="categorycode" -->" selected="selected"><!-- TMPL_VAR NAME="categoryname" --></option>
                                <!-- TMPL_ELSE -->
 <option value="<!-- TMPL_VAR NAME="categorycode" -->"><!-- TMPL_VAR NAME="categoryname" --></option>
                                <!-- /TMPL_IF -->
-                <!-- /TMPL_LOOP -->
-        </optgroup>
-        <!-- /TMPL_LOOP -->
-               </select>
+                               <!-- TMPL_IF NAME="__last__" -->
+                               </optgroup>
+                               <!-- /TMPL_IF -->
+            <!-- /TMPL_LOOP -->
+       <!-- /TMPL_LOOP -->
+       </select>
     <!-- TMPL_ELSE -->
         <span class="problem">There is no category type to add <!--TMPL_IF Name="A"-->an Adult<!--/TMPL_IF--><!--TMPL_IF Name="C"-->a Child<!--/TMPL_IF--><!--TMPL_IF Name="I"-->an Institution<!--/TMPL_IF--><!--TMPL_IF Name="P"-->a professionnal<!--/TMPL_IF--><!--TMPL_IF Name="S"-->a Staff Member<!--/TMPL_IF-->.</span>
               <a href="/cgi-bin/koha/admin/categorie.pl">Please create one</a>

diff --git a/members/memberentry.pl b/members/memberentry.pl
index c25f7c9..fbd8538 100755 (executable)
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -429,8 +429,10 @@ foreach (qw(C A S P I X)) {
        }
        my %typehash;
        $typehash{'typename'}=$_;
+    my $typedescription = "typename_".$typehash{'typename'};
        $typehash{'categoryloop'}=\@categoryloop;
        push @typeloop,{'typename' => $_,
+        $typedescription => 1,
          'categoryloop' => \@categoryloop};
 }  
 $template->param('typeloop' => \@typeloop);