From: Dan Scott <dscott@laurentian.ca>
Date: Wed, 17 Dec 2014 04:08:44 +0000 (-0500)
Subject: Merge branch 'rel_2_7' of git.evergreen-ils.org:Evergreen into rel_2_7_mergery
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=381edae15336f2f61081c38011b6b31d2f7631df;p=contrib%2FConifer.git

Merge branch 'rel_2_7' of git.evergreen-ils.org:Evergreen into rel_2_7_mergery

Signed-off-by: Dan Scott <dscott@laurentian.ca>

Conflicts:
	Open-ILS/src/templates/opac/parts/record/summary.tt2
---

381edae15336f2f61081c38011b6b31d2f7631df
diff --cc Open-ILS/src/templates/opac/parts/record/summary.tt2
index afa542a7fd,79ab4ffdf0..2dd6b9da06
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@@ -106,14 -106,12 +106,13 @@@
          </tr>
      [%- END %]
      </tbody></table>
- [%- END %]
      </div>    
  [%- END %]
 -[%- END %]
 -[%- merged_uris = args.uris.merge(args.online_res);
 -num_uris = merged_uris.size;
 -IF num_uris > 0;
 +[%- # Avoid showing URLs from 856 fields if we have OpenURL results
 +    IF openurls.size == 0;
 +        merged_uris = args.uris.merge(args.online_res);
 +        num_uris = merged_uris.size;
 +        IF num_uris > 0;
  -%]
  <h2 class="rdetail_uris">[% l("Electronic resources") %]</h2>
  <div class="rdetail_uris">