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

[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  6a144c779e4fa5b02ffd92e309eaa79f0891eb46 (commit)
       via  8cdeb16aa522f46fcc84a82c70bed23846bc032c (commit)
      from  4103ef01a877a025b4c1bd44c5439f1b49e3a70a (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 6a144c779e4fa5b02ffd92e309eaa79f0891eb46
Author: Dan Scott <dan at coffeecode.net>
Date:   Wed Jul 12 10:07:23 2017 -0400

    LP#1703678 Display foreign item location and status
    
    We were using copy_info instead of the foreign item's data to try to display
    location and status of foreign items. As copy_info had not been initialized,
    it displayed nothing. Use the foreign item data instead for location and
    status.
    
    Signed-off-by: Dan Scott <dan at coffeecode.net>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index 874c10e..0b6266d 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -72,8 +72,8 @@ IF has_copies or ctx.foreign_copies;
     </td>
     <td>[% bib.target_copy.call_number.label | html %]</td>
     <td>[% bib.target_copy.barcode | html %]</td>
-    <td>[% copy_info.copy_location | html %]</td>
-    <td>[% copy_info.copy_status | html %]</td>
+    <td>[% bib.target_copy.location.name | html %]</td>
+    <td>[% bib.target_copy.status.name | html %]</td>
     <td>[% date.format(ctx.parse_datetime(copy_info.due_date, copy_info.circ_circ_lib),DATE_FORMAT) %]</td>
 </tr>
    [%- END; # FOREACH peer

commit 8cdeb16aa522f46fcc84a82c70bed23846bc032c
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Tue May 31 15:51:47 2016 -0400

    LP#1703678 Show foreign copies even if only one
    
    If a record has no copies of its own, but it does have a foreign copy
    on a peer bib, show that copy info (and the link to the other record).
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index 6be5346..874c10e 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -26,7 +26,7 @@ FOREACH copy_info IN copies;
 END;
 -%]
 [%-
-IF has_copies; 
+IF has_copies or ctx.foreign_copies;
   depth = CGI.param('copy_depth').defined ? CGI.param('copy_depth') : CGI.param('depth').defined ? CGI.param('depth') : ctx.copy_summary.last.depth;
   total_copies = ctx.copy_summary.$depth.count;
 %]

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

Summary of changes:
 .../src/templates/opac/parts/record/copy_table.tt2 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS