[open-ils-commits] [GIT] Evergreen ILS branch master updated. 2ffbacfc992eb0d49f5845e3c24ce0c185e93cb3
Evergreen Git
git at git.evergreen-ils.org
Thu Mar 22 14:08:01 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, master has been updated
via 2ffbacfc992eb0d49f5845e3c24ce0c185e93cb3 (commit)
via 6e7ec4bef9fcdbece1c2ff4758af87765d2ee396 (commit)
via f694179c66ea60411deed4dd4c5d90991a4c10da (commit)
via 7de434d7689ea0e4e1af12c43735c062e38c0de9 (commit)
from 698fbdc4211870d5dd547ec8a0e7302afccb9a50 (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 2ffbacfc992eb0d49f5845e3c24ce0c185e93cb3
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Thu Mar 22 12:51:45 2018 -0400
LP#1728147: more tweaks to grid
* Make paths to expire_time and cut_in_line more concise
* Add SMS Carrier column back
* Tweak labels of the patron first and last name columns
* Ensure that the "Call Number" column continues to be sortable
by normalized call number label. Note that due to a quirk of
egGrid, which doesn't currently have a way to specify that a column
always be retrieved by a fielder query but /not/ be directly
available as a displayable column, we also need a "Call Number Label"
column at the moment.
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2 b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
index 6eb569c..d655968 100644
--- a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
@@ -59,10 +59,20 @@
path="current_copy.location.name" label="[% l('Shelving Location') %]">
</eg-grid-field>
- <eg-grid-field name="call_number_label"
- path="call_number_label" required hidden
+ <!-- Render the colum using the sort-able call number sort key, but
+ display the call number label, complete with prefix and suffix
+ in the cell. -->
+ <eg-grid-field name="call_number_sort_key" required
+ path="current_copy.call_number.label_sortkey"
label="[% l('Call Number') %]">
+ <span>{{item.call_number_label}}</span>
</eg-grid-field>
+ <!-- need call_number_label here so that the grid query always
+ fetches it; otherwise, the call number field above
+ won't consistently display values -->
+ <eg-grid-field name="call_number_label"
+ path="call_number_label" required hidden
+ label="[% l('Call Number Label') %]"></eg-grid-field>
<eg-grid-field name="author"
path="current_copy.call_number.record.simple_record.author"
@@ -100,9 +110,9 @@
{{item.patron_barcode}}
</a>
</eg-grid-field>
- <eg-grid-field label="[% l('Patron alias') %]" path="patron_alias" hidden></eg-grid-field>
- <eg-grid-field label="[% l('Patron First') %]" path="patron_first" hidden></eg-grid-field>
- <eg-grid-field label="[% l('Patron Last') %]" path="patron_last" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Patron Alias') %]" path="patron_alias" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Patron First Name') %]" path="patron_first" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Patron Last Name') %]" path="patron_last" hidden></eg-grid-field>
<eg-grid-field name="pickup_lib_name" path="pickup_lib.name"
hidden label="[% l('Pickup Library') %]"></eg-grid-field>
<eg-grid-field name="pickup_lib_shortname" path="pickup_lib.shortname"
@@ -113,6 +123,8 @@
hidden label="[% l('Request Library (Shortname)') %]"></eg-grid-field>
<eg-grid-field name="selection_ou" path="selection_ou.shortname"
hidden label="[% l('Selection Locus') %]"></eg-grid-field>
+ <eg-grid-field name="sms_carrier_name" path="sms_carrier.name"
+ hidden label="[% l('SMS Carrier') %]"></eg-grid-field>
<eg-grid-field name="sms_notify" path="sms_notify"
hidden label="[% l('SMS Notify') %]"></eg-grid-field>
<eg-grid-field name="email_notify" path="email_notify"
@@ -137,13 +149,13 @@
</eg-grid-field>
<eg-grid-field label="[% l('Edition') %]" path='mvr.edition' hidden>
</eg-grid-field>
- <eg-grid-field label="[% l('Top of Queue') %]" path='hold.cut_in_line' hidden>
+ <eg-grid-field label="[% l('Top of Queue') %]" path='cut_in_line' hidden>
</eg-grid-field>
<eg-grid-field label="[% l('Total Holds') %]" path='total_holds' hidden>
</eg-grid-field>
<eg-grid-field label="[% l('Request Date') %]" path='request_time' datatype="timestamp" hidden>
</eg-grid-field>
- <eg-grid-field label="[% l('Expire Date') %]" path='hold.expire_time' datatype="timestamp" hidden>
+ <eg-grid-field label="[% l('Expire Date') %]" path='expire_time' datatype="timestamp" hidden>
</eg-grid-field>
</eg-grid>
commit 6e7ec4bef9fcdbece1c2ff4758af87765d2ee396
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Thu Mar 22 12:14:17 2018 -0400
LP#1728147: correct fleshing of staff hold column
This patch fixes the test (ahr.usr is fleshed, but not ahr.requestor)
and ensures that the value is cached correctly.
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/holds/app.js b/Open-ILS/web/js/ui/default/staff/circ/holds/app.js
index 33fc77a..8028da5 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/holds/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/holds/app.js
@@ -307,6 +307,11 @@ function($scope , $q , $routeParams , $window , $location , egCore ,
).then(null, null, function(hold_info) {
egProgressDialog.increment();
+
+ // check if this is a staff-created hold
+ // i.e., requestor is not the same as the user
+ hold_info['_is_staff_hold'] = hold_info.hold.requestor() != hold_info.hold.usr().id();
+
var hold_id = hold_info.hold.id();
cached_details[hold_id] = hold_info;
var item = details_needed[hold_id];
@@ -316,11 +321,6 @@ function($scope , $q , $routeParams , $window , $location , egCore ,
angular.forEach(hold_info,
function(val, key) { item[key] = val });
- // check if this is a staff-created hold
- // i.e requestor's profile != 2 (patron)
-
- item['_is_staff_hold'] = item.hold.requestor().id() != item.hold.usr().id();
-
});
}
commit f694179c66ea60411deed4dd4c5d90991a4c10da
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Fri Feb 16 14:40:17 2018 -0500
LP#1728147: Add patron's first/last name and Alias column
These were also missing from the Holds Pull grid.
This patch also corrects the determination of whether a hold
was staff-placed or not.
Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2 b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
index d705c5c..6eb569c 100644
--- a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
@@ -100,6 +100,9 @@
{{item.patron_barcode}}
</a>
</eg-grid-field>
+ <eg-grid-field label="[% l('Patron alias') %]" path="patron_alias" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Patron First') %]" path="patron_first" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Patron Last') %]" path="patron_last" hidden></eg-grid-field>
<eg-grid-field name="pickup_lib_name" path="pickup_lib.name"
hidden label="[% l('Pickup Library') %]"></eg-grid-field>
<eg-grid-field name="pickup_lib_shortname" path="pickup_lib.shortname"
diff --git a/Open-ILS/web/js/ui/default/staff/circ/holds/app.js b/Open-ILS/web/js/ui/default/staff/circ/holds/app.js
index 6884502..33fc77a 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/holds/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/holds/app.js
@@ -319,7 +319,7 @@ function($scope , $q , $routeParams , $window , $location , egCore ,
// check if this is a staff-created hold
// i.e requestor's profile != 2 (patron)
- item['_is_staff_hold'] = item.hold.requestor().profile != 2;
+ item['_is_staff_hold'] = item.hold.requestor().id() != item.hold.usr().id();
});
}
commit 7de434d7689ea0e4e1af12c43735c062e38c0de9
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Tue Jan 30 13:13:52 2018 -0500
LP#1728147 - fix some Holds Pull List grid columns
This adds a few missing columns to the Holds Pull List grid,
and addresses a few display issues.
New columns added are Hold Type, Circ Mod, Staff Hold,
Email/Phone/SMS Notify, Copy Status Change Time, ISBN,
Edition, Top of Queue, Total Holds, and Expire Date.
Signed-off-by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2 b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
index e30ed91..d705c5c 100644
--- a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
@@ -56,29 +56,13 @@
<!-- Define the column using the sort-able copy location order
position, but display the location label in each cell -->
<eg-grid-field name="copy_location_order_position" required
- label="[% l('Shelving Location') %]">
- <span>{{item.shelving_loc}}</span>
- </eg-grid-field>
- <eg-grid-field name="shelving_loc" path="current_copy.location.name"
- required hidden label="[% l('Shelving Location Label') %]">
+ path="current_copy.location.name" label="[% l('Shelving Location') %]">
</eg-grid-field>
- <!-- Render the colum using the sort-able call number sort key, but
- display the call number label, complete with prefix and suffix
- in the cell. -->
- <eg-grid-field name="call_number_sort_key" required
- path="current_copy.call_number.label_sortkey"
- label="[% l('Call Number') %]">
- <span>{{item.cn_prefix}} {{item.call_number_label}} {{item.cn_suffix}}</span>
- </eg-grid-field>
<eg-grid-field name="call_number_label"
path="call_number_label" required hidden
- label="[% l('Call Number Label') %]"></eg-grid-field>
- <eg-grid-field name="cn_prefix" path="current_copy.call_number.prefix.label"
- hidden required label="[% l('Call Number Prefix') %]"></eg-grid-field>
- <eg-grid-field name="cn_suffix" path="current_copy.call_number.suffix.label"
- hidden required label="[% l('Call Number Suffix') %]"></eg-grid-field>
-
+ label="[% l('Call Number') %]">
+ </eg-grid-field>
<eg-grid-field name="author"
path="current_copy.call_number.record.simple_record.author"
@@ -101,7 +85,7 @@
{{item.barcode}}
</a>
</eg-grid-field>
- <eg-grid-field name="parts" path="current_copy.parts.label"
+ <eg-grid-field name="parts" path="part.label"
label="[% l('Parts') %]"></eg-grid-field>
<eg-grid-field name="copy_status" path="current_copy.status.name"
label="[% l('Copy Status') %]"></eg-grid-field>
@@ -126,15 +110,37 @@
hidden label="[% l('Request Library (Shortname)') %]"></eg-grid-field>
<eg-grid-field name="selection_ou" path="selection_ou.shortname"
hidden label="[% l('Selection Locus') %]"></eg-grid-field>
- <eg-grid-field name="sms_carrier_name" path="sms_carrier.name"
- hidden label="[% l('SMS Carrier') %]"></eg-grid-field>
+ <eg-grid-field name="sms_notify" path="sms_notify"
+ hidden label="[% l('SMS Notify') %]"></eg-grid-field>
+ <eg-grid-field name="email_notify" path="email_notify"
+ hidden label="[% l('Email Notify') %]"></eg-grid-field>
+ <eg-grid-field name="phone_notify" path="phone_notify"
+ hidden label="[% l('Phone Notify') %]"></eg-grid-field>
+ <eg-grid-field name="staff_hold" path="_is_staff_hold" datatype="bool"
+ required hidden label="[% l('Staff Hold') %]"></eg-grid-field>
<eg-grid-field label="[% l('Potential Copies') %]"
path='potential_copies'></eg-grid-field>
<eg-grid-field label="[% l('Queue Position') %]"
path='queue_position' hidden></eg-grid-field>
<eg-grid-field label="[% l('Hold ID') %]" path='id' required hidden>
</eg-grid-field>
+ <eg-grid-field label="[% l('Circ Modifier') %]" path='current_copy.circ_modifier' hidden>
+ </eg-grid-field>
+ <eg-grid-field label="[% l('Copy Status Change Time') %]" path='current_copy.status_changed_time' datatype="timestamp" hidden>
+ </eg-grid-field>
+ <eg-grid-field label="[% l('Hold Type') %]" path='hold_type' hidden>
+ </eg-grid-field>
+ <eg-grid-field label="[% l('ISBN') %]" path='mvr.isbn' hidden>
+ </eg-grid-field>
+ <eg-grid-field label="[% l('Edition') %]" path='mvr.edition' hidden>
+ </eg-grid-field>
+ <eg-grid-field label="[% l('Top of Queue') %]" path='hold.cut_in_line' hidden>
+ </eg-grid-field>
+ <eg-grid-field label="[% l('Total Holds') %]" path='total_holds' hidden>
+ </eg-grid-field>
<eg-grid-field label="[% l('Request Date') %]" path='request_time' datatype="timestamp" hidden>
</eg-grid-field>
+ <eg-grid-field label="[% l('Expire Date') %]" path='hold.expire_time' datatype="timestamp" hidden>
+ </eg-grid-field>
</eg-grid>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/holds/app.js b/Open-ILS/web/js/ui/default/staff/circ/holds/app.js
index 00389fe..6884502 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/holds/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/holds/app.js
@@ -316,6 +316,11 @@ function($scope , $q , $routeParams , $window , $location , egCore ,
angular.forEach(hold_info,
function(val, key) { item[key] = val });
+ // check if this is a staff-created hold
+ // i.e requestor's profile != 2 (patron)
+
+ item['_is_staff_hold'] = item.hold.requestor().profile != 2;
+
});
}
-----------------------------------------------------------------------
Summary of changes:
.../src/templates/staff/circ/holds/t_pull_list.tt2 | 55 ++++++++++++++------
Open-ILS/web/js/ui/default/staff/circ/holds/app.js | 5 ++
2 files changed, 43 insertions(+), 17 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list