[open-ils-commits] [GIT] Evergreen ILS branch master updated. 5957d7c5848514dc1f07f63997f5b65ef96d5eab
Evergreen Git
git at git.evergreen-ils.org
Wed Apr 26 09:55:32 EDT 2017
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 5957d7c5848514dc1f07f63997f5b65ef96d5eab (commit)
via 3945de1f0c08bfebdc5903f20aeb89ed44b60a62 (commit)
via d57d767456ae29ef8aabbbd9a5d440f6ae5f7220 (commit)
from cf182c56706344928d942d30d7228f4775425a5c (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 5957d7c5848514dc1f07f63997f5b65ef96d5eab
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Wed Apr 26 09:59:07 2017 -0400
LP#1621178: fix fleshing of copy status for available items
Since copy status 0 means 'Available', test for null
explicitly.
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
index 204d2a5..ab0b07d 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
@@ -466,7 +466,8 @@ function($uibModal , $q , egCore , egConfirmDialog , egAlertDialog) {
hold.current_copy(hold_data.copy);
// likewise, current_copy's status isn't fleshed in the API
- if(hold.current_copy().status() && typeof hold.current_copy().status() != 'object')
+ if(hold.current_copy().status() !== null &&
+ typeof hold.current_copy().status() != 'object')
egCore.pcrud.retrieve('ccs',hold.current_copy().status()
).then(function(c) { hold.current_copy().status(c) });
}
commit 3945de1f0c08bfebdc5903f20aeb89ed44b60a62
Author: Kathy Lussier <klussier at masslnc.org>
Date: Fri Mar 3 07:33:37 2017 -0500
LP#1621178: Tweaks to item status column picker option
This commit:
* Removes the copy status column from the Checkout page. The expectation is
that items will not appear in this grid unless they have a Checked out status.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
index 7035413..b2df987 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
@@ -109,7 +109,6 @@
<eg-grid-field path="circ.*" parent-idl-class="circ" hidden></eg-grid-field>
<eg-grid-field path="acp.*" parent-idl-class="acp" hidden></eg-grid-field>
- <eg-grid-field label="[% l('Copy Status') %]" path="acp.status.name" hidden></eg-grid-field>
<eg-grid-field path="acn.*" parent-idl-class="acn" hidden></eg-grid-field>
<eg-grid-field path="record.*" parent-idl-class="mvr" hidden></eg-grid-field>
<eg-grid-field path="mbts.*" parent-idl-class="mbts" hidden></eg-grid-field>
commit d57d767456ae29ef8aabbbd9a5d440f6ae5f7220
Author: Kyle Huckins <khuckins at catalystdevworks.com>
Date: Tue Oct 25 10:12:56 2016 -0700
LP#1621178 Copy Status Picker
Add copy status field to patron items out, patron
checkout, patron hold, item holds pane, holds shelf, and item status grids.
Signed-off-by: Kyle Huckins <khuckins at catalystdevworks.com>
Signed-off-by: Dawn Dale <ddale at georgialibraries.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Conflicts:
Open-ILS/src/templates/staff/cat/item/t_list.tt2
diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2
index f793a66..aafa779 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2
@@ -88,6 +88,8 @@
<eg-grid-field path='hold.usr.card.*' parent-idl-class="ahr" hidden></eg-grid-field>
<eg-grid-field path='hold.requestor.*' parent-idl-class="ahr" hidden></eg-grid-field>
<eg-grid-field path='hold.requestor.card.*' parent-idl-class="ahr" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Copy Status') %]" path="hold.current_copy.status.name" hidden>
+ </eg-grid-field>
<eg-grid-field path='volume.*' parent-idl-class="acn" hidden></eg-grid-field>
<eg-grid-field path='mvr.*' parent-idl-class="mvr" hidden></eg-grid-field>
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 f448c0d..42dd3f2 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -65,7 +65,7 @@
{{item['_circ']['due_date'] | date:'short'}}
</eg-grid-field>
<eg-grid-field label="[% l('Location') %]" path="location.name" visible></eg-grid-field>
- <eg-grid-field label="[% l('Status') %]" path="status.name" visible></eg-grid-field>
+ <eg-grid-field label="[% l('Copy Status') %]" path="status.name" visible></eg-grid-field>
<eg-grid-field label="[% l('Title') %]"
path="call_number.record.simple_record.title" visible>
<a target="_blank" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item['call_number.record.id']}}">
diff --git a/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2 b/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2
index 1e3cfa4..87dde9b 100644
--- a/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2
@@ -89,6 +89,8 @@
<eg-grid-field label="[% l('Queue Position') %]" path='queue_position' hidden></eg-grid-field>
<eg-grid-field path='hold.usr.*' parent-idl-class="ahr" hidden></eg-grid-field>
<eg-grid-field path='hold.requestor.*' parent-idl-class="ahr" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Copy Status') %]" path="hold.current_copy.status.name" hidden>
+ </eg-grid-field>
<eg-grid-field path='hold.*' parent-idl-class="ahr" hidden></eg-grid-field>
<eg-grid-field path='copy.*' parent-idl-class="acp" hidden></eg-grid-field>
<eg-grid-field path='volume.*' parent-idl-class="acn" hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
index b2df987..7035413 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
@@ -109,6 +109,7 @@
<eg-grid-field path="circ.*" parent-idl-class="circ" hidden></eg-grid-field>
<eg-grid-field path="acp.*" parent-idl-class="acp" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Copy Status') %]" path="acp.status.name" hidden></eg-grid-field>
<eg-grid-field path="acn.*" parent-idl-class="acn" hidden></eg-grid-field>
<eg-grid-field path="record.*" parent-idl-class="mvr" hidden></eg-grid-field>
<eg-grid-field path="mbts.*" parent-idl-class="mbts" hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
index 1406f48..2e12f43 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
@@ -73,6 +73,8 @@
<eg-grid-field label="[% l('Queue Position') %]" path='queue_position' hidden></eg-grid-field>
<eg-grid-field label="[% l('Cancel Cause') %]" path='hold.cancel_cause.label' hidden></eg-grid-field>
<eg-grid-field path='hold.*' parent-idl-class="ahr" ignore="current_copy" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Copy Status') %]" path="hold.current_copy.status.name" hidden>
+ </eg-grid-field>
<eg-grid-field path='copy.*' parent-idl-class="acp" hidden></eg-grid-field>
<eg-grid-field path='hold.usr.*' parent-idl-class="ahr" hidden></eg-grid-field>
<eg-grid-field path='hold.usr.card.*' parent-idl-class="ahr" hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
index 270ef90..a5a1ed7 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
@@ -91,6 +91,7 @@
</eg-grid-field>
<eg-grid-field path="*" hidden></eg-grid-field>
<eg-grid-field path="target_copy.holds_count.count" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Copy Status') %]" path="target_copy.status.name" hidden></eg-grid-field>
<eg-grid-field path="target_copy.circ_modifier" hidden></eg-grid-field>
<eg-grid-field path="target_copy.*" hidden></eg-grid-field>
<eg-grid-field path="target_copy.call_number.*" hidden></eg-grid-field>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
index 7487404..eaeb4b4 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
@@ -98,7 +98,7 @@ function($scope, $q, $routeParams, $timeout, egCore , egUser, patronSvc , $
{ flesh : 4,
flesh_fields : {
circ : ['target_copy', 'workstation', 'checkin_workstation'],
- acp : ['call_number', 'holds_count'],
+ acp : ['call_number', 'holds_count', 'status'],
acn : ['record'],
bre : ['simple_record']
},
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
index 27aae5e..204d2a5 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
@@ -462,8 +462,14 @@ function($uibModal , $q , egCore , egConfirmDialog , egAlertDialog) {
egCore.pcrud.retrieve('au',hold.usr()).then(function(u) { hold.usr(u) });
// current_copy is not always fleshed in the API
- if (hold.current_copy() && typeof hold.current_copy() != 'object')
+ if (hold.current_copy() && typeof hold.current_copy() != 'object') {
hold.current_copy(hold_data.copy);
+
+ // likewise, current_copy's status isn't fleshed in the API
+ if(hold.current_copy().status() && typeof hold.current_copy().status() != 'object')
+ egCore.pcrud.retrieve('ccs',hold.current_copy().status()
+ ).then(function(c) { hold.current_copy().status(c) });
+ }
}
return service;
-----------------------------------------------------------------------
Summary of changes:
.../src/templates/staff/cat/catalog/t_holds.tt2 | 2 ++
Open-ILS/src/templates/staff/cat/item/t_list.tt2 | 2 +-
.../templates/staff/circ/holds/t_shelf_list.tt2 | 2 ++
.../templates/staff/circ/patron/t_holds_list.tt2 | 2 ++
.../templates/staff/circ/patron/t_items_out.tt2 | 1 +
.../js/ui/default/staff/circ/patron/items_out.js | 2 +-
.../web/js/ui/default/staff/circ/services/holds.js | 9 ++++++++-
7 files changed, 17 insertions(+), 3 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list