From 9bd1e83b54e3089bc537085a59525a39280abad3 Mon Sep 17 00:00:00 2001
From: Cesar Velez <cesar.velez@equinoxinitiative.org>
Date: Fri, 19 Jan 2018 12:55:03 -0500
Subject: [PATCH] LP#1738249 - Webstaff CircLib should point to item's circ_lib
 plus misc

This addresses some display issues in the webstaff Item Status grid.
Besides, correcting the Circ Lib to be the item's and not the
circulation,this also fleshes the owning lib. Additionally, I've applied
miker's fix to 1743819 in order to prevent a regression.

Signed-off by: Cesar Velez <cesar.velez@equinoxinitiative.org>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Signed-off-by: Jason Stephenson <jason@sigio.com>
---
 Open-ILS/src/templates/staff/cat/item/t_list.tt2       | 6 +++---
 Open-ILS/web/js/ui/default/staff/circ/services/item.js | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Open-ILS/src/templates/staff/cat/item/t_list.tt2 b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
index 3338a68f47..1019b3f55c 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -83,10 +83,10 @@
   <eg-grid-field label="[% l('Checkin Scan Date') %]"    path="_circ_summary.last_checkin_scan_time" datatype="timestamp" hidden></eg-grid-field>
   <eg-grid-field label="[% l('Checkin Workstation') %]"  path="_circ_summary.last_checkin_workstation" hidden></eg-grid-field>
   <eg-grid-field label="[% l('Checkout Date') %]"  path="_circ_summary.start_time" datatype="timestamp" hidden></eg-grid-field>
-  <eg-grid-field label="[% l('Checkout Workstation') %]"  path="_circ_summary.checkout_workstation" hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Checkout Workstation') %]"  path="_circ.workstation.name" hidden></eg-grid-field>
   <eg-grid-field label="[% l('Checkout/Renewal Library') %]"  path="_circ_lib.shortname" hidden></eg-grid-field>
   <eg-grid-field label="[% l('Circulation ID') %]"        path="_circ.id" hidden></eg-grid-field>
-  <eg-grid-field label="[% l('Circ or Renewal Workstation') %]"  path="_circ.workstation.name" hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Circ or Renewal Workstation') %]"  path="_circ_summary.last_renewal_workstation" hidden></eg-grid-field>
   <eg-grid-field label="[% l('Classification') %]"        path="call_number.label_class.name" hidden></eg-grid-field>
   <eg-grid-field label="[% l('CN Prefix') %]"             path="call_number.prefix.label" hidden></eg-grid-field>
   <eg-grid-field label="[% l('CN Suffix') %]"             path="call_number.suffix.label" hidden></eg-grid-field>
@@ -115,7 +115,7 @@
   <eg-grid-field label="[% l('Loan Duration') %]"         path="loan.duration" hidden></eg-grid-field>
   <eg-grid-field label="[% l('OPAC Visible?') %]"         path="opac_visible" hidden></eg-grid-field>
   <eg-grid-field label="[% l('Owned By') %]"              path="call_number.record.owner" hidden></eg-grid-field>
-  <eg-grid-field label="[% l('Owning Library') %]"        path="call_number.owning_lib" hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Owning Library') %]"        path="call_number.owning_lib.shortname" hidden></eg-grid-field>
   <eg-grid-field label="[% l('Parts') %]"                 path="parts" hidden></eg-grid-field>
   <eg-grid-field label="[% l('Price') %]"                 path="price" hidden></eg-grid-field>
   <eg-grid-field label="[% l('Publication Date') %]"      path="call_number.record.simple_record.pubdate" hidden></eg-grid-field>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/item.js b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
index be05ed5338..15832f0e6e 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/item.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
@@ -131,8 +131,7 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
             if (copyData.circ) {
                 // flesh circ_lib locally
                 copyData.circ.circ_lib(egCore.org.get(copyData.circ.circ_lib()));
-                copyData.circ.checkin_workstation(
-                    egCore.org.get(copyData.circ.checkin_workstation()));
+
             }
             var flatCopy;
 
@@ -142,6 +141,9 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
                     function(c) {return c.id == copyData.copy.id()})[0];
             }
 
+            // flesh acn.owning_lib
+            copyData.copy.call_number().owning_lib(egCore.org.get(copyData.copy.call_number().owning_lib()));
+
             if (!flatCopy) {
                 flatCopy = egCore.idl.toHash(copyData.copy, true);
 
-- 
2.11.0