From aa647ea4bcc7f8ef8cfe74ad4bd79d19eb749012 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Tue, 6 Feb 2018 16:44:32 -0500
Subject: [PATCH] LP#1738249: further fix to checkout workstation
Since accs.checkout_workstation contains the workstation associated
with the initial loan (and not any subsequent renewals), use that.
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 | 2 +-
Open-ILS/web/js/ui/default/staff/circ/services/item.js | 1 -
2 files changed, 1 insertion(+), 2 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 64d38fd8dd..99a34494b8 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -86,7 +86,7 @@
<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="_checkout_ws" 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/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_summary.last_renewal_workstation" 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 1a6e839ce8..b3ecd9f4c7 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
@@ -152,7 +152,6 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
flatCopy._circ_summary = egCore.idl.toHash(copyData.circ_summary, true);
flatCopy._circ_lib = copyData.circ.circ_lib();
flatCopy._duration = copyData.circ.duration();
- flatCopy._checkout_ws = copyData.circ.workstation().name();
}
flatCopy.index = service.index++;
flatCopy.copy_alert_count = copyData.copy.copy_alerts().filter(function(aca) {
--
2.11.0