From 65e58f30b1e239f1c06a98a140ce657d4f269de6 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 7 Oct 2013 10:39:19 -0400
Subject: [PATCH] Bug 10309: (Follow-up) Applying changes from Bug 10349

This patch applies the changes from Bug 10349, Don't show empty
Descriptions/Title notes tabs in OPAC and staff.

"The descriptions/title notes tab appears on the detail page in both
staff client and OPAC even if there are no notes. This is probably a
relic of the pre-T:T days when it wasn't possible to use || in an IF.
This patch adds a check for the various variables which might trigger
the display of the tab.

To test, apply the patch and view records in the OPAC and staff client
which do and do not have title notes attached (whether that be in the
MARC record or in the biblio.notes column). In the OPAC Syndetics
content should also be tested if possible. The descriptions/title notes
tab should only appear if there is content."

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works well. No errors

Tested on OPAC, records without notes don't show title notes tab.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 .../bootstrap/en/modules/opac-detail.tt       | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 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 af896aeee0..5e03941f84 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -522,7 +522,9 @@
                         [% IF (SeparateHoldings) %]
                             <li><a href="#otherholdings">Other holdings ( [% otheritemloop.size || 0 %] )</a></li>
                         [% END %]
-                        <li id="tab_descriptions"> <a href="#descriptions">Title notes</a></li>
+                        [% IF ( MARCNOTES || notes || ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY )) %]
+                            <li id="tab_descriptions"> <a href="#descriptions">Title notes</a></li>
+                        [% END %]
                         [% IF ( SYNDETICS_TOC ) %]
                             <li id="tab_toc"> <a href="#toc">TOC</a></li>
                         [% END %]
@@ -661,28 +663,30 @@
                         </div>
                     [% END # / SeparateHoldings %]
 
-                    <div id="descriptions">
-                        <div class="content_set">
-
-                        [% IF ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY ) %]
-                            <h4>Enhanced descriptions from Syndetics:</h4>
-                            <p>[% SYNDETICS_SUMMARY %]</p>
-                        [% END %]
+                    [% IF ( MARCNOTES || notes || ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY )) %]
+                        <div id="descriptions">
+                            <div class="content_set">
 
-                        [% IF ( MARCNOTES ) %]
-                            <div id="marcnotes">
-                            [% FOREACH MARCNOTE IN MARCNOTES %]
-                                <p>[% MARCNOTE.marcnote FILTER html_line_break %]</p>
+                            [% IF ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY ) %]
+                                <h4>Enhanced descriptions from Syndetics:</h4>
+                                <p>[% SYNDETICS_SUMMARY %]</p>
                             [% END %]
-                            </div>
-                        [% ELSE %]
-                            [% IF ( notes ) %]
-                                <p>[% notes %]</p>
+
+                            [% IF ( MARCNOTES ) %]
+                                <div id="marcnotes">
+                                [% FOREACH MARCNOTE IN MARCNOTES %]
+                                    <p>[% MARCNOTE.marcnote FILTER html_line_break %]</p>
+                                [% END %]
+                                </div>
+                            [% ELSE %]
+                                [% IF ( notes ) %]
+                                    <p>[% notes %]</p>
+                                [% END %]
                             [% END %]
-                        [% END %]
 
-                        </div>
-                    </div> <!-- / #descriptions -->
+                            </div>
+                        </div> <!-- / #descriptions -->
+                    [% END # / IF MARCNOTES || notes %]
 
                     [% IF ( SyndeticsEnabled ) %]
                         [% IF ( SyndeticsTOC && SYNDETICS_TOC ) %]
-- 
2.39.5