[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/admin/cate... [rel_3_0]

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Antoine Farnault <toins>        06/10/17 16:56:55

Modified files:
        koha-tmpl/intranet-tmpl/prog/en/admin: categorie.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/members: memberentryI.tmpl 
        members        : memberentry.pl 

Log message:
        Display an error on the template if no category code has been created 
for this category type.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.7&r2=1.6.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.38.2.9&r2=1.38.2.10

Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl        6 Jun 2006 
08:38:18 -0000       1.3
+++ koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl        17 Oct 2006 
16:56:55 -0000      1.3.2.1
@@ -83,7 +83,7 @@
        <tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" -->
                                <input type="hidden" name="categorycode" 
value="<!-- TMPL_VAR NAME="categorycode" -->" /></td></tr>
        <!-- TMPL_ELSE -->
-       <tr><th>Category code</th><td><input type="text" name="categorycode" 
size="3" maxlength="2" onblur="toUC(this)" /></td></tr>
+       <tr><th>Category code</th><td><input type="text" name="categorycode" 
size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
        <!-- /TMPL_IF -->
        <tr><th>Description</th><td>&nbsp; <input type="text" 
name="description" size="40" maxlength="80" value="<!-- TMPL_VAR 
NAME=description -->" /></td></tr>
        <tr><th>Enrolment period</th><td>&nbsp; <input type="text" 
name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR 
NAME=enrolmentperiod -->" /> months</td></tr>

Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl,v
retrieving revision 1.6.2.7
retrieving revision 1.6.2.8
diff -u -b -r1.6.2.7 -r1.6.2.8
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl   13 Oct 2006 
14:56:21 -0000      1.6.2.7
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl   17 Oct 2006 
16:56:55 -0000      1.6.2.8
@@ -104,8 +104,14 @@
                        <input style="text-transform:uppercase;" type="text" 
name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >       
                </p>
                <p>
+                   <!-- TMPL_IF NAME="catcodepopup" -->
                        <label>Select a category</label>
                        <!-- TMPL_VAR NAME="catcodepopup" -->
+                       <!-- TMPL_ELSE -->
+                           <span class="problem">No category type match for 
institution.</span>
+                               <a 
href="/cgi-bin/koha/admin/categorie.pl">Please create one</a>
+                            
+                       <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="city_cgipopup" -->   
                                        <!-- TMPL_IF 
NAME="mandatoryselect_city" -->
                                        <<label style="font-weight:bold">

Index: members/memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.38.2.9
retrieving revision 1.38.2.10
diff -u -b -r1.38.2.9 -r1.38.2.10
--- members/memberentry.pl      17 Oct 2006 16:41:40 -0000      1.38.2.9
+++ members/memberentry.pl      17 Oct 2006 16:56:55 -0000      1.38.2.10
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: memberentry.pl,v 1.38.2.9 2006/10/17 16:41:40 toins Exp $
+# $Id: memberentry.pl,v 1.38.2.10 2006/10/17 16:56:55 toins Exp $
 
 # Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
 #
@@ -281,14 +281,18 @@
        my $action="WHERE category_type=?";
        my ($categories,$labels)=GetborCatFromCatType($category_type,$action);
        
-       #if u modify the borrowers u must have the right value for is category 
code
-       
+       if(scalar(@$categories)){
+           #if you modify the borrowers you must have the right value for his 
category code
        (my $default_category=$data{'categorycode'}) if ($op  eq '');
-       my $catcodepopup = CGI::popup_menu(-name=>'categorycode',
+           my $catcodepopup = CGI::popup_menu(
+               -name=>'categorycode',
                                        -id => 'categorycode',
                                        -values=>$categories,
                                        -default=>$default_category,
-                                       -labels=>$labels);
+                       -labels=>$labels
+           );
+           $template->param(catcodepopup=>$catcodepopup);
+       }
        #test in city
        $select_city=getidcity($data{'city'}) if ($guarantorid ne '0');
        ($default_city=$select_city) if ($step eq 0);
@@ -484,7 +488,6 @@
                B_phone        => $data{'B_phone'},
                dateofbirth     => $data{'dateofbirth'},
                branchcode      => $data{'branchcode'},
-               catcodepopup    => $catcodepopup,
                categorycode    => $data{'categorycode'},
                dateenrolled    => format_date($data{'dateenrolled'}),
                dateexpiry      => format_date($data{'dateexpiry'}),