From f51cc2d5fb962d4cb2912b1f0de2c83b2c947bad Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@esilibrary.com>
Date: Mon, 26 May 2014 02:48:41 +0000
Subject: [PATCH] Bug 7720: (follow-up) fix issues in Bootstrap theme

- Fix breakage of tablesorting when OpacLocationBranchToDisplay
  is set to both.
- When displaying the home library, ensure that its correct
  name and URL are displayed
- Remove the attempt to display the "opac_info" tooltip for
  the home library, as it is not currently retrieved.

RM NOTE: Rather than add a GetOpacInfo function or the like
to the TT Branches plugin, simpler would be adding a
plugin function that fetches a DBIC result object for
a given branchcode, thereby allowing any column in the
branches table to be fetched into the template.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index c3f38dd809..5b671b2316 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -1196,7 +1196,7 @@
                                 <link property="itemOffered" href="#record" />
                                 <link property="businessFunction" href="http://purl.org/goodrelations/v1#LeaseOut">
                                 <div class="[% ITEM_RESULT.branch_opac_info ? 'branch-info-tooltip-trigger' : '' %]">
-                                    [% IF ( ITEM_RESULT.branchurl ) %]
+                                    [% IF Branches.GetURL( ITEM_RESULT.homebranch ) %]
                                         [% home_branch_url = Branches.GetURL( ITEM_RESULT.homebranch ) %]
                                         [% IF ( home_branch_url ) %]
                                              <a href="[% home_branch_url %]">[% Branches.GetName( ITEM_RESULT.homebranch ) %]</a>
@@ -1204,7 +1204,7 @@
                                             [% Branches.GetName( ITEM_RESULT.homebranch ) %]
                                         [% END %]
                                     [% ELSE %]
-                                        <span title="">[% ITEM_RESULT.branchname %]</span>
+                                        <span title="">[% Branches.GetName( ITEM_RESULT.homebranch ) %]</span>
                                     [% END %]
                                 </div>
 
@@ -1212,7 +1212,6 @@
                                     <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
                                 [% END %]
 
-                                <div class="branch-info-tooltip">[% ITEM_RESULT.branch_opac_info %]</div>
                             </td>
                         [% END %]
 
@@ -1385,6 +1384,7 @@
             "aoColumns": [
                 [% IF ( item_level_itypes ) %]null,[% END %]
                 null,
+                [% IF ( OpacLocationBranchToDisplay == 'both' ) %]null,[% END %]
                 [% IF ( itemdata_ccode ) %]null,[% END %]
                 null,
                 [% IF ( itemdata_enumchron ) %]null,[% END %]
-- 
2.39.2