From c80033b27710254c0a5e6f9b69ecbaf378be9402 Mon Sep 17 00:00:00 2001
From: Nick <nick@bywatersolutions.com>
Date: Wed, 18 Nov 2015 11:49:15 -0500
Subject: [PATCH] Bug 15210 - Novelist throws an error if no ISBN
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This patch makes opac-detail.tt check for an ISBN before attempting to load
Novelist content and prevents a js error which breaks other code.

To test:
1 - Enable novelist
2 - Add a visible change to OPACUserJS eg: $(document).ready(function()
    {$("body").css("background-color","pink");}); 3 - Load a record with no ISBN
4 - Note you do not see a color change in the body and that there is an error
    in the console 5 - Apply patch
6 - Reload the record
7 - You should see the color change and no error in the js

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 65c5fa4385a8e080cfd46a8197b4417bcd579b6a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 77bd7557fa7adb196ed46fd7ae3ceea98db3a67c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 .../opac-tmpl/bootstrap/en/modules/opac-detail.tt  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 417d46a329..f99e6afd12 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,7 @@
                         </span>
                     [% END # / IF BakerTaylorContentURL %]
 
-                    [% IF ( NovelistSelectProfile ) %]
+                    [% IF ( NovelistSelectProfile && normalized_isbn ) %]
                         [% IF ( NovelistSelectView == 'above') %]
                             <span class="results_summary">
                             <span class="label">Novelist Select: </span>
@@ -596,7 +596,7 @@
                             <li id="tab_comments"><a href="#comments">Comments ( [% reviews.size || 0 %] )</a></li>
                         [% END %]
 
-                        [% IF ( NovelistSelectProfile ) %]
+                        [% IF ( NovelistSelectProfile && normalized_isbn ) %]
                             [% IF ( NovelistSelectView == 'tab') %]
                                 <li id="tab_NovelistSelect"> <a href="#NovelistSelect">Novelist Select</a></li>
                             [% END %]
@@ -790,7 +790,7 @@
                         [% END # / IF SyndeticsReviews && SYNDETICS_REVIEWS %]
                     [% END # / IF SyndeticsEnabled %]
 
-                    [% IF ( NovelistSelectProfile && NovelistSelectView == 'tab') %]
+                    [% IF ( NovelistSelectProfile && NovelistSelectView == 'tab' && normalized_isbn ) %]
                        <div id="NovelistSelect">
                             <div data-novelist-novelistselect=[% normalized_isbn %]></div>
                        </div>
@@ -1031,7 +1031,7 @@
                         [% END %]
                 </div> <!-- / #bibliodescriptions -->
 
-                [% IF ( NovelistSelectProfile && NovelistSelectView == 'below' ) %]
+                [% IF ( NovelistSelectProfile && NovelistSelectView == 'below' && normalized_isbn ) %]
                     <div id="NovelistSelect">
                         <h3>Novelist Select</h3>
                         <div data-novelist-novelistselect="[% normalized_isbn %]"></div>
@@ -1100,7 +1100,7 @@
 
                 [% INCLUDE 'opac-detail-sidebar.inc' %]
 
-                [% IF ( NovelistSelectProfile && NovelistSelectView == 'right') %]
+                [% IF ( NovelistSelectProfile && NovelistSelectView == 'right' && normalized_isbn ) %]
                     <div id="NovelistSelect">
                         <h4>Novelist Select</h4>
                         <div data-novelist-novelistselect=[% normalized_isbn %]></div>
@@ -1142,7 +1142,7 @@
             [% END %]
         [% END %]
 
-        [% IF ( NovelistSelectProfile ) %]
+        [% IF ( NovelistSelectProfile && normalized_isbn ) %]
             <script type="text/javascript" src="https://imageserver.ebscohost.com/novelistselect/ns2init.js"></script>
         [% END %]
 
@@ -1473,7 +1473,7 @@
     [% IF OPACLocalCoverImages %]
         KOHA.LocalCover.GetCoverFromBibnumber(true);
     [% END %]
-    [% IF ( NovelistSelectProfile ) %]
+    [% IF ( NovelistSelectProfile && normalized_isbn ) %]
         novSelect.loadContentForISBN('[% normalized_isbn %]','[% NovelistSelectProfile %]', '[% NovelistSelectPassword %]', function(d){});
     [% END %]
 
-- 
2.39.5