From: Lebbeous Fogle-Weekley Date: Wed, 11 Jan 2012 15:37:29 +0000 (-0500) Subject: Merge remote branch 'working/collab/berick/invalidate_email_and_phone_revised' X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b65aa0f6febe1a7f81c427b81922a4a0fd047323;p=evergreen%2Fjoelewis.git Merge remote branch 'working/collab/berick/invalidate_email_and_phone_revised' Signed-off-by: Lebbeous Fogle-Weekley --- b65aa0f6febe1a7f81c427b81922a4a0fd047323 diff --cc Open-ILS/src/sql/Pg/002.schema.config.sql index 1c71641ca0,86f211aa0b..db5fa70e89 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@@ -86,7 -86,7 +86,7 @@@ CREATE TRIGGER no_overlapping_dep 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 ('0669', :eg_version); -- tsbere/miker ++INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0670', :eg_version); -- berick/senator CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --cc Open-ILS/src/sql/Pg/upgrade/0670.data.mark-email-and-phone-invalid.sql index 0000000000,0000000000..bbc6810fbc new file mode 100644 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/0670.data.mark-email-and-phone-invalid.sql @@@ -1,0 -1,0 +1,63 @@@ ++-- Evergreen DB patch 0670.data.mark-email-and-phone-invalid.sql ++-- ++-- Add org unit settings and standing penalty types to support ++-- the mark email/phone invalid features. ++-- ++BEGIN; ++ ++-- check whether patch can be applied ++SELECT evergreen.upgrade_deps_block_check('0670', :eg_version); ++ ++ ++INSERT INTO config.standing_penalty (id, name, label, staff_alert, org_depth) VALUES ++ ( ++ 31, ++ 'INVALID_PATRON_EMAIL_ADDRESS', ++ oils_i18n_gettext( ++ 31, ++ 'Patron had an invalid email address', ++ 'csp', ++ 'label' ++ ), ++ TRUE, ++ 0 ++ ), ++ ( ++ 32, ++ 'INVALID_PATRON_DAY_PHONE', ++ oils_i18n_gettext( ++ 32, ++ 'Patron had an invalid daytime phone number', ++ 'csp', ++ 'label' ++ ), ++ TRUE, ++ 0 ++ ), ++ ( ++ 33, ++ 'INVALID_PATRON_EVENING_PHONE', ++ oils_i18n_gettext( ++ 33, ++ 'Patron had an invalid evening phone number', ++ 'csp', ++ 'label' ++ ), ++ TRUE, ++ 0 ++ ), ++ ( ++ 34, ++ 'INVALID_PATRON_OTHER_PHONE', ++ oils_i18n_gettext( ++ 34, ++ 'Patron had an invalid other phone number', ++ 'csp', ++ 'label' ++ ), ++ TRUE, ++ 0 ++ ); ++ ++ ++COMMIT;