From 337f7d58e4f84c3cf35d1c6642daee2e6aa9db30 Mon Sep 17 00:00:00 2001 From: Lebbeous Fogle-Weekley Date: Tue, 10 Jan 2012 12:59:57 -0500 Subject: [PATCH] Add a "staff_alert" column to config.standing_penalty, and ... ... consult this when deciding whether to show the stop sign page in the patron interface of the staff client, rather than explicitly checking for the id of the ALERT_NOTE config.standing_penalty. Signed-off-by: Lebbeous Fogle-Weekley --- Open-ILS/examples/fm_IDL.xml | 1 + Open-ILS/src/sql/Pg/002.schema.config.sql | 3 ++- Open-ILS/src/sql/Pg/upgrade/XXXX.schema.alerting-penalties.sql | 10 ++++++++++ Open-ILS/xul/staff_client/server/patron/display.js | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.alerting-penalties.sql diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml index 07b98154a9..b0b4753177 100644 --- a/Open-ILS/examples/fm_IDL.xml +++ b/Open-ILS/examples/fm_IDL.xml @@ -2943,6 +2943,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 1333f2745e..d1243fc975 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -122,6 +122,7 @@ CREATE TABLE config.standing_penalty ( name TEXT NOT NULL UNIQUE, label TEXT NOT NULL, block_list TEXT, + staff_alert BOOL NOT NULL DEFAULT FALSE, org_depth INTEGER ); INSERT INTO config.standing_penalty (id,name,label,block_list) @@ -133,7 +134,7 @@ INSERT INTO config.standing_penalty (id,name,label,block_list) INSERT INTO config.standing_penalty (id,name,label,block_list) VALUES (4,'PATRON_EXCEEDS_COLLECTIONS_WARNING','Patron exceeds pre-collections warning fine threshold','CIRC|HOLD|RENEW'); -INSERT INTO config.standing_penalty (id,name,label) VALUES (20,'ALERT_NOTE','Alerting Note, no blocks'); +INSERT INTO config.standing_penalty (id,name,label,staff_alert) VALUES (20,'ALERT_NOTE','Alerting Note, no blocks',TRUE); INSERT INTO config.standing_penalty (id,name,label) VALUES (21,'SILENT_NOTE','Note, no blocks'); INSERT INTO config.standing_penalty (id,name,label,block_list) VALUES (22,'STAFF_C','Alerting block on Circ','CIRC'); INSERT INTO config.standing_penalty (id,name,label,block_list) VALUES (23,'STAFF_CH','Alerting block on Circ and Hold','CIRC|HOLD'); diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.alerting-penalties.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.alerting-penalties.sql new file mode 100644 index 0000000000..31b6cff675 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.alerting-penalties.sql @@ -0,0 +1,10 @@ +BEGIN; + +SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); + +ALTER TABLE config.standing_penalty ADD staff_alert BOOL NOT NULL DEFAULT FALSE; + +-- 20 is ALERT_NOTE +UPDATE config.standing_penalty SET staff_alert = TRUE WHERE id = 20; + +COMMIT; diff --git a/Open-ILS/xul/staff_client/server/patron/display.js b/Open-ILS/xul/staff_client/server/patron/display.js index 3cf9f96f69..ca490bc4c1 100644 --- a/Open-ILS/xul/staff_client/server/patron/display.js +++ b/Open-ILS/xul/staff_client/server/patron/display.js @@ -963,7 +963,7 @@ patron.display.prototype = { if (!penalties) { penalties = []; } var dl_flag_opened = false; for (var i = 0; i < penalties.length; i++) { - if (penalties[i].standing_penalty().block_list() || penalties[i].standing_penalty().id() == 20 /* ALERT_NOTE */) { + if (penalties[i].standing_penalty().block_list() || penalties[i].standing_penalty().staff_alert()) { if (!dl_flag_opened) { msg += '
'; dl_flag_opened = true; -- 2.11.0