From 3298d25ea8d1d6daaf20a6989c54c63c315e7e1c Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 24 Nov 2020 21:25:43 +0000 Subject: [PATCH] LP1901930 SIP mediator continued Signed-off-by: Bill Erickson --- .../staff/admin/server/sip/account.component.ts | 2 + .../src/sql/Pg/upgrade/XXXX.schema.sip-config.sql | 118 ++++++++++++--------- 2 files changed, 72 insertions(+), 48 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/sip/account.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/sip/account.component.ts index 52f102d4ad..1502667498 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/server/sip/account.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/server/sip/account.component.ts @@ -154,6 +154,7 @@ export class SipAccountComponent implements OnInit { } openDeleteDialog() { + /* const grp = this.account.setting_group(); // Find accounts that use this group @@ -185,6 +186,7 @@ export class SipAccountComponent implements OnInit { }) .pipe(tap(result => { if (result) + */ } accountSaved() { diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.sip-config.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.sip-config.sql index 29ede40ce1..ea6dde4833 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.sip-config.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.sip-config.sql @@ -61,69 +61,91 @@ INSERT INTO sip.setting_group (id, label, institution) -- carve space for other canned setting groups SELECT SETVAL('sip.setting_group_id_seq'::TEXT, 1000); -INSERT INTO sip.setting (setting_group, description, name, value) +INSERT INTO sip.setting (setting_group, name, value, description) VALUES ( - 1, + 1, 'currency', '"USD"', oils_i18n_gettext( - 'eg.staffcat.exclude_electronic', - 'Staff Catalog "Exclude Electronic Resources" Option', - 'cwst', 'label' - ) - - 'Monetary amounts are reported in this currency', - 'currency', '"USD"' + (SELECT id FROM sip.setting WHERE name = 'currency'), + 'Monetary amounts are reported in this currency', + 'sipset', 'description') ), ( - 1, - 'AV Format. Options: eg_legacy, 3m, swyer_a, swyer_b', - 'av_format', '"eg_legacy"' + 1, 'av_format', '"eg_legacy"', + oils_i18n_gettext( + (SELECT id FROM sip.setting WHERE name = 'av_format'), + 'AV Format. Options: eg_legacy, 3m, swyer_a, swyer_b', + 'sipset', 'description') ), ( - 1, - 'Allow clients to request the SIP server status before login (message 99)', - 'allow_sc_status_before_login', 'true' + 1, 'allow_sc_status_before_login', 'true', + oils_i18n_gettext( + (SELECT id FROM sip.setting WHERE name = 'allow_sc_status_before_login'), + 'Allow clients to request the SIP server status before login (message 99)', + 'sipset', 'description') ), ( - 1, - 'Due date uses 18-char date format (YYYYMMDDZZZZHHMMSS). Otherwise "YYYY-MM-DD HH:MM:SS', - 'due_date_use_sip_date_format', 'false' + 1, 'due_date_use_sip_date_format', 'false', + oils_i18n_gettext( + (SELECT id FROM sip.setting WHERE name = 'due_date_use_sip_date_format'), + 'Due date uses 18-char date format (YYYYMMDDZZZZHHMMSS). Otherwise "YYYY-MM-DD HH:MM:SS', + 'sipset', 'description') ), ( - 1, - 'Checkout and renewal are allowed even when penalties blocking these actions exist', - 'patron_status_permit_loans', 'false' + 1, 'patron_status_permit_loans', 'false', + oils_i18n_gettext( + (SELECT id FROM sip.setting WHERE name = 'patron_status_permit_loans'), + 'Checkout and renewal are allowed even when penalties blocking these actions exist', + 'sipset', 'description') ), ( - 1, - 'Holds, checkouts, and renewals allowed regardless of blocking penalties', - 'patron_status_permit_all', 'false' + 1, 'patron_status_permit_all', 'false', + oils_i18n_gettext( + (SELECT id FROM sip.setting WHERE name = 'patron_status_permit_all'), + 'Holds, checkouts, and renewals allowed regardless of blocking penalties', + 'sipset', 'description') ), ( - 1, - 'Patron holds data may be returned as either "title" or "barcode"', - 'default_activity_who', 'null' + 1, 'default_activity_who', 'null', + oils_i18n_gettext( + (SELECT id FROM sip.setting WHERE name = 'default_activity_who'), + 'Patron holds data may be returned as either "title" or "barcode"', + 'sipset', 'description') ), ( - 1, - 'Patron circulation data may be returned as either "title" or "barcode"', - 'msg64_summary_datatype', '"title"' + 1, 'msg64_summary_datatype', '"title"', + oils_i18n_gettext( + (SELECT id FROM sip.setting WHERE name = 'msg64_summary_datatype'), + 'Patron circulation data may be returned as either "title" or "barcode"', + 'sipset', 'description') ), ( - 1, - 'Patron holds data may be returned as either "title" or "barcode"', - 'msg64_hold_items_available', '"title"' + 1, 'msg64_hold_items_available', '"title"', + oils_i18n_gettext( + (SELECT id FROM sip.setting WHERE name = 'msg64_hold_items_available'), + 'Patron holds data may be returned as either "title" or "barcode"', + 'sipset', 'description') ), ( - 1, - 'Checkout override copy alert message', - 'checkout.override.COPY_ALERT_MESSAGE', 'true' + 1, 'checkout.override.COPY_ALERT_MESSAGE', 'true', + oils_i18n_gettext( + (SELECT id FROM sip.setting WHERE name = 'checkout.override.COPY_ALERT_MESSAGE'), + 'Checkout override copy alert message', + 'sipset', 'description') ), ( - 1, - 'Checkin override copy alert message', - 'checkin.override.COPY_ALERT_MESSAGE', 'true' + 1, 'checkin.override.COPY_ALERT_MESSAGE', 'true', + oils_i18n_gettext( + (SELECT id FROM sip.setting WHERE name = 'checkin.override.COPY_ALERT_MESSAGE'), + 'Checkin override copy alert message', + 'sipset', 'description') ), ( - 1, - 'Checkin override bad copy status', - 'checkin.override.COPY_BAD_STATUS', 'true' + 1, 'checkin.override.COPY_BAD_STATUS', 'true', + oils_i18n_gettext( + (SELECT id FROM sip.setting WHERE name = 'checkin.override.COPY_BAD_STATUS'), + 'Checkin override bad copy status', + 'sipset', 'description') ), ( - 1, - 'Checkin override copy status missing', - 'checkin.override.COPY_STATUS_MISSING', 'true' + 1, 'checkin.override.COPY_STATUS_MISSING', 'true', + oils_i18n_gettext( + (SELECT id FROM sip.setting WHERE name = 'checkin.override.COPY_STATUS_MISSING'), + 'Checkin override copy status missing', + 'sipset', 'description') ), ( - 1, - 'Checkin local holds as transits', - 'checkin_hold_as_transit', 'false' + 1, 'checkin_hold_as_transit', 'false', + oils_i18n_gettext( + (SELECT id FROM sip.setting WHERE name = 'checkin_hold_as_transit'), + 'Checkin local holds as transits', + 'sipset', 'description') ); /* EXAMPLE SETTINGS -- 2.11.0