[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. 3896f1ec89970c8e8e2e984b38558558977b8810
Evergreen Git
git at git.evergreen-ils.org
Mon Apr 30 14:26:51 EDT 2018
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, rel_3_0 has been updated
via 3896f1ec89970c8e8e2e984b38558558977b8810 (commit)
via 6f4002306d8fec5a33ec41fc12d5e831be6aa4aa (commit)
via 785de699ea51c21377e2223ee8c0e8338297989f (commit)
via 9bd1e83b54e3089bc537085a59525a39280abad3 (commit)
via 7af83a833a138778b223da0b191893df30975201 (commit)
from 18ac86c66617cbe3efefb52407877902c691ef86 (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 3896f1ec89970c8e8e2e984b38558558977b8810
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Tue Feb 6 16:56:56 2018 -0500
LP#1738249: sort out circ or renewal workstation
This patch uses accs to work out the name of the workstation
of the most recent renewal, if it exists, or the original
checkout. It implicitly handles the case where the workstation
on the original circulation is null. As a bonus, this patch
adds an explicit "Last Renewal Workstation" to the item status
grid.
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
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 858e54d..253ddef 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,8 @@
<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>
+ <eg-grid-field label="[% l('Circ or Renewal Workstation') %]" path="_circ_ws" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Last 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>
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 4de0058..b94921e 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,6 +152,11 @@ 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._circ_ws = flatCopy._circ_summary.last_renewal_workstation ?
+ flatCopy._circ_summary.last_renewal_workstation :
+ flatCopy._circ_summary.checkout_workstation ?
+ flatCopy._circ_summary.checkout_workstation :
+ '';
}
flatCopy.index = service.index++;
service.copies.unshift(flatCopy);
commit 6f4002306d8fec5a33ec41fc12d5e831be6aa4aa
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Tue Feb 6 16:44:32 2018 -0500
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 at equinoxinitiative.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
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 873a416..858e54d 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -83,7 +83,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 edb1f4b..4de0058 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++;
service.copies.unshift(flatCopy);
commit 785de699ea51c21377e2223ee8c0e8338297989f
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Thu Jan 25 12:50:59 2018 -0500
LP#1738249 - Fix checkout_workstation display issue
Addresses the issue with checkout workstation, by
attaching as a object property to the flatCopy hash.
Also makes sure the pcrud call uses combcirc.
Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
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 1019b3f..873a416 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -83,7 +83,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="_circ.workstation.name" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Checkout Workstation') %]" path="_checkout_ws" 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 15832f0..edb1f4b 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
@@ -62,7 +62,7 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
}
service.getCirc = function(id) {
- return egCore.pcrud.search('aacs', { target_copy : id },
+ return egCore.pcrud.search('combcirc', { target_copy : id },
service.circFlesh).then(function(circ) {return circ});
}
@@ -152,6 +152,7 @@ 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++;
service.copies.unshift(flatCopy);
commit 9bd1e83b54e3089bc537085a59525a39280abad3
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Fri Jan 19 12:55:03 2018 -0500
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 at equinoxinitiative.org>
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
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 3338a68..1019b3f 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 be05ed5..15832f0 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);
commit 7af83a833a138778b223da0b191893df30975201
Author: Kathy Lussier <klussier at masslnc.org>
Date: Tue Jan 16 23:40:32 2018 -0500
LP#1738249: Item status column picker fixes
Adds some fixes to the column pickers in the web staff client Item Status
interface:
* The Circulation Library field now displays the asset.copy circ library
instead of the checkout library.
* The Circulation Library and Checkout / Renewal Library now show the
shortname instead of the full name.
* A typo fix so that Remaining Renewals display
Conflicts:
Open-ILS/src/templates/staff/cat/item/t_list.tt2
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
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 2cf3f7e..3338a68 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -84,7 +84,7 @@
<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/Renewal Library') %]" path="_circ.circ_lib.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('Classification') %]" path="call_number.label_class.name" hidden></eg-grid-field>
@@ -122,7 +122,7 @@
<eg-grid-field label="[% l('Publisher') %]" path="call_number.record.simple_record.publisher" hidden></eg-grid-field>
<eg-grid-field label="[% l('Quality') %]" path="call_number.record.simple_record.quality" hidden></eg-grid-field>
<eg-grid-field label="[% l('Reference?') %]" path="ref" hidden></eg-grid-field>
- <eg-grid-field label="[% l('Remaining Renewals') %]" path="_circ.renewals_remaining" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Remaining Renewals') %]" path="_circ.renewal_remaining" hidden></eg-grid-field>
<eg-grid-field label="[% l('Status Changed Time') %]" path="status_changed_time" datatype="timestamp" hidden></eg-grid-field>
<eg-grid-field label="[% l('TCN') %]" path="call_number.record.tcn_value" hidden></eg-grid-field>
<eg-grid-field label="[% l('TCN Source') %]" path="call_number.record.tcn_source" hidden></eg-grid-field>
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/staff/cat/item/t_list.tt2 | 9 +++++----
.../web/js/ui/default/staff/circ/services/item.js | 13 ++++++++++---
2 files changed, 15 insertions(+), 7 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list