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

[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  6273f1ddae68d48322144d11d06b1034580e153e (commit)
       via  9619a1b583e20051054914fc18fb2a1997c58cb5 (commit)
      from  f0f88695d5fe6184a9bfb94fdee4c8a9c53dd3ec (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 6273f1ddae68d48322144d11d06b1034580e153e
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Wed May 17 11:22:25 2017 -0400

    LP#1411699: ensure that Dojo remains available for added content tab
    
    This patch is meant to avoid a (very minor) silent regression
    introduced by the previous patch; ultimately, though, the
    functionality of tweaking the visibility of added content types
    in the added content tab should be rewritten to drop any
    requirement of Dojo.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/Open-ILS/src/templates/opac/parts/header.tt2 b/Open-ILS/src/templates/opac/parts/header.tt2
index f61db05..7a8e40d 100644
--- a/Open-ILS/src/templates/opac/parts/header.tt2
+++ b/Open-ILS/src/templates/opac/parts/header.tt2
@@ -111,6 +111,12 @@
         want_dojo = 1;
     END;
 
+    # ... and for code that tweaks visibility of types on the added
+    # content tab
+    IF ctx.page == 'record' AND (ctx.expand_addedcontent OR ctx.expand_all);
+        want_dojo = 1;
+    END;
+
     use_autosuggest = ctx.get_cgf("opac.use_autosuggest");
 
     IF use_autosuggest.enabled == "t";

commit 9619a1b583e20051054914fc18fb2a1997c58cb5
Author: Dan Scott <dscott at laurentian.ca>
Date:   Sun Apr 2 10:45:00 2017 -0400

    LP#1411699: Make Dojo conditional for advanced search
    
    While the copy locations filter is a core feature, it surfaces only in the
    advanced search page. The current behaviour forces Dojo and all of its
    dependencies to be loaded for every catalogue page.
    
    By making it conditional on the advanced search page, we save approximately
    600ms to first meaningful paint on the rest of the catalogue pages.
    
    To test:
    
    [1] Apply the two-patch series
    [2] After applying the patch, verify that the copy location filter
        on the advance search page functions. Also verify that
        the JavaScript on the record details page that tweaks
        the visiblity of sub-tabs in the added content tab
        continue to work.
    [3] Verify that other components that currently depend on Dojo,
        such as the ebook API, continue to work.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/Open-ILS/src/templates/opac/parts/header.tt2 b/Open-ILS/src/templates/opac/parts/header.tt2
index a0ffcb8..f61db05 100644
--- a/Open-ILS/src/templates/opac/parts/header.tt2
+++ b/Open-ILS/src/templates/opac/parts/header.tt2
@@ -106,9 +106,10 @@
         END;
     END;
 
-    # Dojo is required to use the copy locations advanced search filter,
-    # therefore, it should always be enabled.
-    want_dojo = 1;
+    # Dojo is required for the copy locations advanced search filter
+    IF ctx.page == 'advanced';
+        want_dojo = 1;
+    END;
 
     use_autosuggest = ctx.get_cgf("opac.use_autosuggest");
 

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

Summary of changes:
 Open-ILS/src/templates/opac/parts/header.tt2 |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS