Bug 6353: Erroneous prefixes before the singleBranchMode preference removed

Patch resent due to errors in formating in previous e-mail

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked:
- library facet
- library limit on advanced search
- library shown in item level hold table

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
index 4931283..2129026 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
@@ -15,7 +15,7 @@
 [% IF ( facets_loo.type_label_Topics ) %]Topics[% END %]
 [% IF ( facets_loo.type_label_Places ) %]Places[% END %]
 [% IF ( facets_loo.type_label_Series ) %]Series[% END %]
-[% UNLESS ( facets_loo.singleBranchMode ) %]
+[% UNLESS ( singleBranchMode ) %]
 [% IF ( facets_loo.type_label_Libraries ) %]Libraries[% END %]
 [% END %]
 <ul>

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
index 4480338..25e9a3a 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
@@ -452,7 +452,7 @@
                               <th>Item Type</th>
                             [% END %]
                             <th>Barcode</th>
-                            [% UNLESS ( bibitemloo.singleBranchMode ) %]
+                            [% UNLESS ( singleBranchMode ) %]
                               <th>Home Library</th>
                               <th>Last Location</th>
                             [% END %]

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
index ed7218e..1004e0c 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -441,14 +441,14 @@ $(document).ready(function(){
                     <span class="available"><strong>Copies available:</strong>
                     [% FOREACH available_items_loo IN SEARCH_RESULT.available_items_loop %]
                     [% UNLESS ( available_items_loo.hideatopac ) %]
-                    [% IF ( available_items_loo.singleBranchMode ) %]
+                    [% IF ( singleBranchMode ) %]
                         [% available_items_loo.location %]
                     [% ELSE %]
                         [% available_items_loo.branchname %]
                     [% END %]
 
                     [% IF ( OPACItemsResultsDisplay ) %]
-                                           [% UNLESS ( available_items_loo.singleBranchMode ) %][% available_items_loo.location %][% END %]
+                                           [% UNLESS ( singleBranchMode ) %][% available_items_loo.location %][% END %]
                         [% IF ( available_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/opac-search.pl?q=callnum:[% available_items_loo.itemcallnumber |url %]">[% available_items_loo.itemcallnumber %]</a>][% END %]
                     [% END %]
                     ([% available_items_loo.count %]),