[open-ils-commits] [GIT] Evergreen ILS branch master updated. 5a6636f53ad07c718c6ba207d3f9d543deec72db
Evergreen Git
git at git.evergreen-ils.org
Fri Mar 23 15:41:40 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 5a6636f53ad07c718c6ba207d3f9d543deec72db (commit)
via 5a39d42b640f26048cc7cf69b92fd4d90d9888a6 (commit)
via 1114b1d7b28563cfbc75d0f15f5cc7f8cb85ca4b (commit)
from ef25453cd7e1f6b46728f8cfee17ba44a1b9955f (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 5a6636f53ad07c718c6ba207d3f9d543deec72db
Author: Kathy Lussier <klussier at masslnc.org>
Date: Fri Mar 23 15:39:49 2018 -0400
LP#1699838: Stamping upgrade script for default pickup lib YAOUS
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index bdb73b1..c05350e 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,7 @@ CREATE TRIGGER no_overlapping_deps
BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1107', :eg_version); --rhamby/kmlussier
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1109', :eg_version); --dbwells/kmlussier
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.yaos-circ-holds-default-pickup-lib.sql b/Open-ILS/src/sql/Pg/upgrade/1109.data.yaos-circ-holds-default-pickup-lib.sql
similarity index 85%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.yaos-circ-holds-default-pickup-lib.sql
rename to Open-ILS/src/sql/Pg/upgrade/1109.data.yaos-circ-holds-default-pickup-lib.sql
index 4bad146..a94922a 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.yaos-circ-holds-default-pickup-lib.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1109.data.yaos-circ-holds-default-pickup-lib.sql
@@ -1,6 +1,6 @@
BEGIN;
--- SELECT evergreen.upgrade_deps_block_check('xxxx', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1109', :eg_version);
INSERT into config.org_unit_setting_type (name, label, grp, description, datatype)
values ('circ.staff_placed_holds_fallback_to_ws_ou','Workstation OU fallback for staff-placed holds',
commit 5a39d42b640f26048cc7cf69b92fd4d90d9888a6
Author: Dan Wells <dbw2 at calvin.edu>
Date: Fri Mar 23 13:07:45 2018 -0400
LP#1699838 Scale back settings for staff-based hold placement
For now, we will add just one new setting to optionally restore the old
behavior. In the absence of a 'preferred pickup location', the staff
form will default to the staff workstation OU.
Also, add setting to seed data.
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Conflicts:
Open-ILS/src/sql/Pg/950.data.seed-values.sql
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 720a359..6816911 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -5446,6 +5446,16 @@ INSERT into config.org_unit_setting_type
'description'
),
'bool', null)
+,( 'circ.staff_placed_holds_fallback_to_ws_ou', 'circ',
+ oils_i18n_gettext(
+ 'circ.staff_placed_holds_fallback_to_ws_ou',
+ 'Workstation OU fallback for staff-placed holds',
+ 'coust', 'label'),
+ oils_i18n_gettext(
+ 'circ.staff_placed_holds_fallback_to_ws_ou',
+ 'For staff-placed holds, in the absence of a patron preferred pickup location, fall back to using the staff workstation OU (rather than patron home OU)',
+ 'coust', 'description'),
+ 'bool', null)
;
UPDATE config.org_unit_setting_type
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.yaos-circ-holds-default-pickup-lib.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.yaos-circ-holds-default-pickup-lib.sql
index 236dc1b..4bad146 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.yaos-circ-holds-default-pickup-lib.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.yaos-circ-holds-default-pickup-lib.sql
@@ -3,12 +3,8 @@ BEGIN;
-- SELECT evergreen.upgrade_deps_block_check('xxxx', :eg_version);
INSERT into config.org_unit_setting_type (name, label, grp, description, datatype)
-values ('circ.staff_placed_holds_honor_patron_prefs_first','Honor the patron-preferred Pickup Library as default for staff-placed holds.',
- 'circ', 'Honor the patron-preferred Pickup Library as the default for staff-placed holds.', 'bool');
-
-INSERT into config.org_unit_setting_type (name, label, grp, description, datatype)
-values ('circ.staff_placed_holds_staff_ws_ou_override','During Staff-placed holds, use the patron-preferred location or their home OU instead of the Staff User Workstation Org. unit as default pickup location.',
- 'circ', 'During staff-placed holds, use the patron-preferred location or their home OU instead of the Staff User Workstation Org. unit as default pickup location.', 'bool');
+values ('circ.staff_placed_holds_fallback_to_ws_ou','Workstation OU fallback for staff-placed holds',
+ 'circ', 'For staff-placed holds, in the absence of a patron preferred pickup location, fall back to using the staff workstation OU (rather than patron home OU)', 'bool');
COMMIT;
diff --git a/Open-ILS/web/js/ui/default/opac/staff.js b/Open-ILS/web/js/ui/default/opac/staff.js
index 711c995..51d9eaa 100644
--- a/Open-ILS/web/js/ui/default/opac/staff.js
+++ b/Open-ILS/web/js/ui/default/opac/staff.js
@@ -110,31 +110,13 @@ function staff_hold_usr_barcode_changed2(
}
cur_hold_barcode = load_info.barcode;
if (!only_settings || (isload && isload !== true)) {
- document.getElementById('hold_usr_input').value = load_info.barcode;
- // Safe at this point as we already set cur_hold_barcode
- }
-
- var patronDefaultPickupOU;
- if (!only_settings || (isload && isload !== true) && load_info.pickup_lib) {
-
- // Patron default is either their preferred pickup loc or their home OU
- patronDefaultPickupOU = load_info.settings['opac.default_pickup_location']
- ? load_info.settings['opac.default_pickup_location'] : load_info.pickup_lib;
-
- document.getElementById('pickup_lib').value = patronDefaultPickupOU;
// Safe at this point as we already set cur_hold_barcode
- }
-
- if (load_info.settings['staff_WS_OU']){ // this is staff-placed hold!
-
- // check wether we want to default to staff's WS OU or just the patron's Home OU
- document.getElementById('pickup_lib').value = load_info.settings['overrideStaff_WS_OU']
- ? patronDefaultPickupOU : load_info.settings['staff_WS_OU'];
-
- // use staff WS OU as default pickup_lib unless YAOUS says otherwise
- document.getElementById('pickup_lib').value = load_info.settings['honorPatronPrefPickupOU']
- ? patronDefaultPickupOU : load_info.settings['staff_WS_OU'];
+ document.getElementById('hold_usr_input').value = load_info.barcode;
+ // Patron preferred pickup loc always overrides the default pickup lib
+ document.getElementById('pickup_lib').value =
+ load_info.settings['opac.default_pickup_location'] ?
+ load_info.settings['opac.default_pickup_location'] : load_info.pickup_lib;
}
if (!load_info.settings['opac.default_sms_notify']){
diff --git a/Open-ILS/web/js/ui/default/staff/services/eframe.js b/Open-ILS/web/js/ui/default/staff/services/eframe.js
index 1b423b2..5096165 100644
--- a/Open-ILS/web/js/ui/default/staff/services/eframe.js
+++ b/Open-ILS/web/js/ui/default/staff/services/eframe.js
@@ -239,8 +239,7 @@ angular.module('egCoreMod')
return null;
}
- egCore.org.settings(['circ.staff_placed_holds_honor_patron_prefs_first',
- 'circ.staff_placed_holds_staff_ws_ou_override'])
+ egCore.org.settings(['circ.staff_placed_holds_fallback_to_ws_ou'])
.then(function(auth_usr_aous){
// copied more or less directly from XUL menu.js
@@ -251,19 +250,12 @@ angular.module('egCoreMod')
}
// find applicable YAOUSes for staff-placed holds
- var honorPatronPrefPickupOU;
- var overrideStaff_WS_OU;
var requestor = egCore.auth.user();
+ var pickup_lib = user.home_ou(); // default to home ou
if (requestor.id() !== user.id()){
- // this is a staff-placed hold
-
- settings["staff_WS_OU"] = requestor.ws_ou();
- if (auth_usr_aous['circ.staff_placed_holds_honor_patron_prefs_first']){
- settings['honorPatronPrefPickupOU'] = true;
- }
-
- if (auth_usr_aous['circ.staff_placed_holds_staff_ws_ou_override']){
- settings['overrideStaff_WS_OU'] = true;
+ // this is a staff-placed hold, optionally default to ws ou
+ if (auth_usr_aous['circ.staff_placed_holds_fallback_to_ws_ou']){
+ pickup_lib = requestor.ws_ou();
}
}
@@ -283,7 +275,7 @@ angular.module('egCoreMod')
deferred.resolve({
"barcode": barcode,
- "pickup_lib": user.home_ou(),
+ "pickup_lib": pickup_lib,
"settings" : settings,
"user_email" : user.email(),
"patron_name" : patron_name
commit 1114b1d7b28563cfbc75d0f15f5cc7f8cb85ca4b
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Wed Feb 28 14:08:08 2018 -0500
LP1699838 - add YOUSes for defaulting hold pickup locs
Add a YAOUS... err make that two, to control how staff-placed holds
default the pickup library.
Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.yaos-circ-holds-default-pickup-lib.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.yaos-circ-holds-default-pickup-lib.sql
new file mode 100644
index 0000000..236dc1b
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.yaos-circ-holds-default-pickup-lib.sql
@@ -0,0 +1,14 @@
+BEGIN;
+
+-- SELECT evergreen.upgrade_deps_block_check('xxxx', :eg_version);
+
+INSERT into config.org_unit_setting_type (name, label, grp, description, datatype)
+values ('circ.staff_placed_holds_honor_patron_prefs_first','Honor the patron-preferred Pickup Library as default for staff-placed holds.',
+ 'circ', 'Honor the patron-preferred Pickup Library as the default for staff-placed holds.', 'bool');
+
+INSERT into config.org_unit_setting_type (name, label, grp, description, datatype)
+values ('circ.staff_placed_holds_staff_ws_ou_override','During Staff-placed holds, use the patron-preferred location or their home OU instead of the Staff User Workstation Org. unit as default pickup location.',
+ 'circ', 'During staff-placed holds, use the patron-preferred location or their home OU instead of the Staff User Workstation Org. unit as default pickup location.', 'bool');
+
+COMMIT;
+
diff --git a/Open-ILS/web/js/ui/default/opac/staff.js b/Open-ILS/web/js/ui/default/opac/staff.js
index 37d9a3c..711c995 100644
--- a/Open-ILS/web/js/ui/default/opac/staff.js
+++ b/Open-ILS/web/js/ui/default/opac/staff.js
@@ -109,14 +109,43 @@ function staff_hold_usr_barcode_changed2(
return;
}
cur_hold_barcode = load_info.barcode;
- if(!only_settings || (isload && isload !== true)) document.getElementById('hold_usr_input').value = load_info.barcode; // Safe at this point as we already set cur_hold_barcode
- if(!only_settings || (isload && isload !== true) && load_info.pickup_lib) document.getElementById('pickup_lib').value = load_info.pickup_lib; // Safe at this point as we already set cur_hold_barcode
- if(load_info.settings['opac.default_pickup_location'])
- document.getElementById('pickup_lib').value = load_info.settings['opac.default_pickup_location'];
- if(!load_info.settings['opac.default_phone']) load_info.settings['opac.default_phone'] = '';
- if(!load_info.settings['opac.default_sms_notify']) load_info.settings['opac.default_sms_notify'] = '';
- if(!load_info.settings['opac.default_sms_carrier']) load_info.settings['opac.default_sms_carrier'] = '';
- if(load_info.settings['opac.hold_notify'] || load_info.settings['opac.hold_notify'] === '') {
+ if (!only_settings || (isload && isload !== true)) {
+ document.getElementById('hold_usr_input').value = load_info.barcode;
+ // Safe at this point as we already set cur_hold_barcode
+ }
+
+ var patronDefaultPickupOU;
+ if (!only_settings || (isload && isload !== true) && load_info.pickup_lib) {
+
+ // Patron default is either their preferred pickup loc or their home OU
+ patronDefaultPickupOU = load_info.settings['opac.default_pickup_location']
+ ? load_info.settings['opac.default_pickup_location'] : load_info.pickup_lib;
+
+ document.getElementById('pickup_lib').value = patronDefaultPickupOU;
+ // Safe at this point as we already set cur_hold_barcode
+ }
+
+ if (load_info.settings['staff_WS_OU']){ // this is staff-placed hold!
+
+ // check wether we want to default to staff's WS OU or just the patron's Home OU
+ document.getElementById('pickup_lib').value = load_info.settings['overrideStaff_WS_OU']
+ ? patronDefaultPickupOU : load_info.settings['staff_WS_OU'];
+
+ // use staff WS OU as default pickup_lib unless YAOUS says otherwise
+ document.getElementById('pickup_lib').value = load_info.settings['honorPatronPrefPickupOU']
+ ? patronDefaultPickupOU : load_info.settings['staff_WS_OU'];
+
+ }
+
+ if (!load_info.settings['opac.default_sms_notify']){
+ load_info.settings['opac.default_sms_notify'] = '';
+ }
+
+ if (!load_info.settings['opac.default_sms_carrier']){
+ load_info.settings['opac.default_sms_carrier'] = '';
+ }
+
+ if (load_info.settings['opac.hold_notify'] || load_info.settings['opac.hold_notify'] === '') {
var email = load_info.settings['opac.hold_notify'].indexOf('email') > -1;
var phone = load_info.settings['opac.hold_notify'].indexOf('phone') > -1;
var sms = load_info.settings['opac.hold_notify'].indexOf('sms') > -1;
@@ -127,8 +156,10 @@ function staff_hold_usr_barcode_changed2(
update_elements = document.getElementsByName('sms_notify_checkbox');
for(var i in update_elements) update_elements[i].checked = (sms ? 'checked' : '');
}
+
update_elements = document.getElementsByName('phone_notify');
- for(var i in update_elements) update_elements[i].value = load_info.settings['opac.default_phone'];
+ for(var i in update_elements) update_elements[i].value = load_info.settings['opac.default_phone']
+ ? load_info.settings['opac.default_phone'] : '';
update_elements = document.getElementsByName('sms_notify');
for(var i in update_elements) update_elements[i].value = load_info.settings['opac.default_sms_notify'];
update_elements = document.getElementsByName('sms_carrier');
diff --git a/Open-ILS/web/js/ui/default/staff/services/eframe.js b/Open-ILS/web/js/ui/default/staff/services/eframe.js
index ae26e7f..1b423b2 100644
--- a/Open-ILS/web/js/ui/default/staff/services/eframe.js
+++ b/Open-ILS/web/js/ui/default/staff/services/eframe.js
@@ -239,34 +239,56 @@ angular.module('egCoreMod')
return null;
}
- // copied more or less directly from XUL menu.js
- var settings = {};
- for(var i = 0; i < user.settings().length; i++) {
- settings[user.settings()[i].name()] =
- JSON2js(user.settings()[i].value());
- }
-
- if(!settings['opac.default_phone'] && user.day_phone())
- settings['opac.default_phone'] = user.day_phone();
- if(!settings['opac.hold_notify'] && settings['opac.hold_notify'] !== '')
- settings['opac.hold_notify'] = 'email:phone';
-
- // Taken from patron/util.js format_name
- // FIXME: I18n
- var patron_name =
- ( user.prefix() ? user.prefix() + ' ' : '') +
- user.family_name() + ', ' +
- user.first_given_name() + ' ' +
- ( user.second_given_name() ? user.second_given_name() + ' ' : '' ) +
- ( user.suffix() ? user.suffix() : '');
-
- deferred.resolve({
- "barcode": barcode,
- "pickup_lib": user.home_ou(),
- "settings" : settings,
- "user_email" : user.email(),
- "patron_name" : patron_name
- });
+ egCore.org.settings(['circ.staff_placed_holds_honor_patron_prefs_first',
+ 'circ.staff_placed_holds_staff_ws_ou_override'])
+ .then(function(auth_usr_aous){
+
+ // copied more or less directly from XUL menu.js
+ var settings = {};
+ for(var i = 0; i < user.settings().length; i++) {
+ settings[user.settings()[i].name()] =
+ JSON2js(user.settings()[i].value());
+ }
+
+ // find applicable YAOUSes for staff-placed holds
+ var honorPatronPrefPickupOU;
+ var overrideStaff_WS_OU;
+ var requestor = egCore.auth.user();
+ if (requestor.id() !== user.id()){
+ // this is a staff-placed hold
+
+ settings["staff_WS_OU"] = requestor.ws_ou();
+ if (auth_usr_aous['circ.staff_placed_holds_honor_patron_prefs_first']){
+ settings['honorPatronPrefPickupOU'] = true;
+ }
+
+ if (auth_usr_aous['circ.staff_placed_holds_staff_ws_ou_override']){
+ settings['overrideStaff_WS_OU'] = true;
+ }
+ }
+
+ if(!settings['opac.default_phone'] && user.day_phone())
+ settings['opac.default_phone'] = user.day_phone();
+ if(!settings['opac.hold_notify'] && settings['opac.hold_notify'] !== '')
+ settings['opac.hold_notify'] = 'email:phone';
+
+ // Taken from patron/util.js format_name
+ // FIXME: I18n
+ var patron_name =
+ ( user.prefix() ? user.prefix() + ' ' : '') +
+ user.family_name() + ', ' +
+ user.first_given_name() + ' ' +
+ ( user.second_given_name() ? user.second_given_name() + ' ' : '' ) +
+ ( user.suffix() ? user.suffix() : '');
+
+ deferred.resolve({
+ "barcode": barcode,
+ "pickup_lib": user.home_ou(),
+ "settings" : settings,
+ "user_email" : user.email(),
+ "patron_name" : patron_name
+ });
+ });
});
return deferred.promise;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 10 +++
...109.data.yaos-circ-holds-default-pickup-lib.sql | 10 +++
Open-ILS/web/js/ui/default/opac/staff.js | 31 ++++++---
.../web/js/ui/default/staff/services/eframe.js | 70 ++++++++++++--------
5 files changed, 85 insertions(+), 38 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1109.data.yaos-circ-holds-default-pickup-lib.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list