[open-ils-commits] [GIT] Evergreen ILS branch master updated. c3abc07f7c0a14ec3dc7e1b3006d9af0969bb6a7

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  c3abc07f7c0a14ec3dc7e1b3006d9af0969bb6a7 (commit)
       via  5adb8d1c97256bda5a66690f0a9b9052fc20cd3a (commit)
      from  ebf932e1444d8c56fc66a78a12042050534ebc9d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c3abc07f7c0a14ec3dc7e1b3006d9af0969bb6a7
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Fri Aug 25 10:29:43 2017 -0400

    LP#1712840: extend fix to circ and holds history tabs
    
    This patch fixes the remaining two instances of a
    bare 'IF ebook_api.enabled' test.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Ben Shum <ben at evergreener.net>

diff --git a/Open-ILS/src/templates/opac/myopac/circ_history.tt2 b/Open-ILS/src/templates/opac/myopac/circ_history.tt2
index 6940bde..423c4ff 100644
--- a/Open-ILS/src/templates/opac/myopac/circ_history.tt2
+++ b/Open-ILS/src/templates/opac/myopac/circ_history.tt2
@@ -14,7 +14,7 @@
         <div class="align">
             <a href='[% mkurl('circs',{},1) %]'>[% l("Current Items Checked Out") %]</a>
         </div>
-        [%- IF ebook_api.enabled %]
+        [%- IF ebook_api.enabled == 'true' %]
         <div class="align">
             <a href="[% mkurl('ebook_circs',{},1) %]">[% l("E-Items Currently Checked Out") %]</a>
         </div>
diff --git a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
index 9f22b1d..068557f 100644
--- a/Open-ILS/src/templates/opac/myopac/hold_history.tt2
+++ b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
@@ -15,7 +15,7 @@
         <div class="align">
             <a href='[% mkurl('holds',{},['limit','offset']) %]'>[% l("Items on Hold") %]</a>
         </div>
-        [% IF ebook_api.enabled %]
+        [% IF ebook_api.enabled == 'true' %]
         <div class="align">
             <a href='[% mkurl('ebook_holds', {}, ['limit','offset','available','sort','sort_type']) %]'>[% l("E-Items on Hold") %]</a>
         </div>

commit 5adb8d1c97256bda5a66690f0a9b9052fc20cd3a
Author: McCanna <tmccanna at georgialibraries.org>
Date:   Fri Aug 25 09:53:14 2017 -0400

    LP#1712840 Ebook tabs always visible in My Account
    
    Corrects a problem in My Account where the ebook tabs
    on the checkouts and holds pages were always visible
    regardless of whether the ebook_api.enabled value was
    set to true or false.
    
    Signed-off-by: McCanna <tmccanna at georgialibraries.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Ben Shum <ben at evergreener.net>

diff --git a/Open-ILS/src/templates/opac/myopac/circs.tt2 b/Open-ILS/src/templates/opac/myopac/circs.tt2
index 92ae989..1b0683c 100644
--- a/Open-ILS/src/templates/opac/myopac/circs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/circs.tt2
@@ -10,7 +10,7 @@
         <div class="align selected">
             <a href="#">[% l("Current Items Checked Out") %]</a>
         </div>
-        [%- IF ebook_api.enabled %]
+        [%- IF ebook_api.enabled == 'true' %]
         <div class="align">
             <a href="[% mkurl('ebook_circs',{},1) %]">[% l("E-Items Currently Checked Out") %]</a>
         </div>
diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2
index 100e806..5a0c3c4 100644
--- a/Open-ILS/src/templates/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds.tt2
@@ -15,7 +15,7 @@
         <div class="align selected">
             <a href='#'>[% l("Items on Hold") %]</a>
         </div>
-        [% IF ebook_api.enabled %]
+        [% IF ebook_api.enabled == 'true' %]
         <div class="align">
             <a href='[% mkurl('ebook_holds', {}, ['limit','offset','available','sort','sort_type']) %]'>[% l("E-Items on Hold") %]</a>
         </div>

-----------------------------------------------------------------------

Summary of changes:
 .../src/templates/opac/myopac/circ_history.tt2     |    2 +-
 Open-ILS/src/templates/opac/myopac/circs.tt2       |    2 +-
 .../src/templates/opac/myopac/hold_history.tt2     |    2 +-
 Open-ILS/src/templates/opac/myopac/holds.tt2       |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS