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

[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  df16ba71822e48b7661b1057d523b15deb20f7c8 (commit)
       via  be736f312fd5d078714740e9afc866fe977a5bf5 (commit)
      from  639d3fbb8ec26ad07dd30f53170dce6aa53c4f84 (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 df16ba71822e48b7661b1057d523b15deb20f7c8
Author: Dan Scott <dscott at laurentian.ca>
Date:   Fri Jul 27 17:24:07 2012 -0400

    Fix summary display in TPAC; avoid Content Cafe
    
    While in misc_util.tt2 we're grabbing args.summary as a single string,
    and args.summaries as the list of summaries, this gets complicated
    elsewhere in the summaries display chain, where we're checking for the
    number of list elements in "summary" (which is now a string), as well as
    a confusion of logic where ContentCafe was being displayed whether or
    not the environment variable existed.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/templates/opac/parts/record/extras.tt2 b/Open-ILS/src/templates/opac/parts/record/extras.tt2
index 276c969..c031bc7 100644
--- a/Open-ILS/src/templates/opac/parts/record/extras.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/extras.tt2
@@ -10,7 +10,7 @@
 
         # Let's see if we should hide the content cafe / simple summary content
         hide_summary = 1;
-        IF attrs.summary.0; hide_summary = 0; ELSE;
+        IF attrs.summaries.0; hide_summary = 0; ELSE;
             # Expose content cafe if it's reasonable to do so.
             # This approach only works when using embedded content cafe.
             IF ENV.OILS_CONTENT_CAFE_USER; 
diff --git a/Open-ILS/src/templates/opac/parts/record/summaryplus.tt2 b/Open-ILS/src/templates/opac/parts/record/summaryplus.tt2
index 7796213..27513be 100644
--- a/Open-ILS/src/templates/opac/parts/record/summaryplus.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summaryplus.tt2
@@ -1,19 +1,20 @@
 <div class='rdetail_extras_div'> 
-    [%  IF attrs.summary %]
+    [%- IF attrs.summary %]
     <div class='rdetail-extras-summary'>
         <strong>[% l('Summary: ') %]</strong>
-        [% FOR sum IN attrs.summary %]
+        [% FOR sum IN attrs.summaries %]
             [% IF !loop.first; '<br/>'; END %]
             <span>[% sum | html %] </span>
         [% END %]
     </div>
-    [% END %]
-
+    [%- END %]
+    [%- IF ENV.OILS_CONTENT_CAFE_USER %]
     <!-- Embedded content cafe iframe -->
     [% ident = attrs.isbn_clean || attrs.upc %]
     <iframe width="100%" height="400" frameborder="0" 
         src="[% ctx.proto %]://contentcafe2.btol.com/ContentCafeClient/ContentCafe.aspx?UserID=[%- 
             ENV.OILS_CONTENT_CAFE_USER %]&amp;Password=[% ENV.OILS_CONTENT_CAFE_PASS %]&amp;ItemKey=[% ident | uri %]&amp;Options=Y" >
     </iframe>
+    [%- END %]
 </div>
 

commit be736f312fd5d078714740e9afc866fe977a5bf5
Author: Ben Shum <bshum at biblio.org>
Date:   Fri Jul 27 16:06:28 2012 -0400

    TPAC - repair summary statement display
    
    Change variable from summary to summaries to properly associate values
    for the summary statement display in Tpac.
    
    Signed-off-by: Ben Shum <bshum at biblio.org>
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/templates/opac/parts/misc_util.tt2 b/Open-ILS/src/templates/opac/parts/misc_util.tt2
index d7e93d0..524a66b 100644
--- a/Open-ILS/src/templates/opac/parts/misc_util.tt2
+++ b/Open-ILS/src/templates/opac/parts/misc_util.tt2
@@ -63,7 +63,7 @@
         FOR sub IN xml.findnodes('//*[@tag="520"]/*[@code="a"]');
             args.summaries.push(sub.textContent);
         END;
-        args.summary = (args.summary.size) ? args.summary.0 : '';
+        args.summary = (args.summaries.size) ? args.summaries.0 : '';
 
         args.editions = [];
         ed_hunt = xml.findnodes('//*[@tag="250"]/*[@code="a"]') ||

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

Summary of changes:
 Open-ILS/src/templates/opac/parts/misc_util.tt2    |    2 +-
 .../src/templates/opac/parts/record/extras.tt2     |    2 +-
 .../templates/opac/parts/record/summaryplus.tt2    |    9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Evergreen ILS