bug 4908: rename temlate variable to branchname

Using branchname is more accurate and could avoid
a bug if/when the patron update function is made more
sophisticated.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
index db9c416..73f5c21 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
@@ -73,7 +73,7 @@
 <legend>Library Use:</legend>
 <ol>
        <li><label for="cardnumber">Card number:</label><input type="text" id="cardnumber" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="cardnumber" -->" /></li>
-    <li><label for="branchcode">Home library:</label><input type="text" id="branchcode" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="branchcode" -->" /></li>
+    <li><label for="branchname">Home library:</label><input type="text" id="branchname" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="branchname" -->" /></li>
        <li><label for="borrowernumber">Patron Number:</label><input type="text" id="borrowernumber" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /></li>
        <li><label for="categorycode">Patron Category:</label><input type="text" id="categorycode" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="description" --> (<!-- TMPL_VAR NAME="categorycode" -->)" /></li>
        <li><label for="dateenrolled">Joined: </label><input type="text" id="dateenrolled" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="dateenrolled" -->" /></li>

diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index a9d0101..ab2e15d 100755 (executable)
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -150,7 +150,7 @@ $borr->{'dateenrolled'} = format_date( $borr->{'dateenrolled'} );
 $borr->{'dateexpiry'}   = format_date( $borr->{'dateexpiry'} );
 $borr->{'dateofbirth'}  = format_date( $borr->{'dateofbirth'} );
 $borr->{'ethnicity'}    = fixEthnicity( $borr->{'ethnicity'} );
-$borr->{'branchcode'}   = GetBranchName($borr->{'branchcode'});
+$borr->{'branchname'}   = GetBranchName($borr->{'branchcode'});
 
 if (C4::Context->preference('ExtendedPatronAttributes')) {
     my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber, 'opac');