[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. 555f0ab32dba3f4c8a0bdf1097fcfe606a683897

[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  555f0ab32dba3f4c8a0bdf1097fcfe606a683897 (commit)
      from  4373455618798e6eb3bf25411f532810dc440703 (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 555f0ab32dba3f4c8a0bdf1097fcfe606a683897
Author: Dan Scott <dscott at laurentian.ca>
Date:   Tue Oct 21 11:02:12 2014 -0400

    lp1383763 - Display OpenURL embargo statement
    
    The ResolverResolver service fetches the embargo statement (such as
    "Last year not available") from OpenURL resolvers and stores it in a
    target_embargo field. In JSPAC we used to display this along with the
    coverage statement, because it is very important that people know that a
    resource may be available from 1999 but the last year isn't available
    online.
    
    Restore the display of this information to the TPAC.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index 10bba56..d5aacb4 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -95,8 +95,14 @@
         FOREACH res IN openurls;
 %]
         <tr>
-            <td class='rdetail_openurl_entry'><a href="[% res.target_url %]">[% res.public_name %]</a></td>
-            <td>[% res.target_coverage %]</td>
+            <td class='rdetail_openurl_entry'><a href="[% res.target_url %]">[% res.public_name | html %]</a></td>
+            <td>[% res.target_coverage | html %]
+            [%- IF res.target_embargo != '';
+                    ' - ';
+                    res.target_embargo | html;
+                END;
+            -%]
+            </td>
         </tr>
     [%- END %]
     </tbody></table>
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index ff9cda9..baebf63 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -243,7 +243,13 @@ END;
                                                                 <strong><a href="[% res.target_url %]">
                                                                 [% res.public_name | html %]</a></strong>
                                                             </td>
-                                                            <td>[% res.target_coverage | html %]</td>
+                                                            <td>[% res.target_coverage | html %]
+                                                            [%- IF res.target_embargo != '';
+                                                                    ' - ';
+                                                                    res.target_embargo | html;
+                                                                END;
+                                                            -%]
+                                                            </td>
                                                         </tr>
                                                                 [% END %]
                                                             [% END %]

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

Summary of changes:
 .../src/templates/opac/parts/record/summary.tt2    |   10 ++++++++--
 Open-ILS/src/templates/opac/parts/result/table.tt2 |    8 +++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS