From 58d4fd02a382947d732fa701aaa4fb96725e680b Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Sun, 20 Jan 2019 12:09:29 -0500 Subject: [PATCH] typo correction --- .../Pg/version-upgrade/pines-post-3.2-upgrade.sql | 172 +-------------------- 1 file changed, 8 insertions(+), 164 deletions(-) diff --git a/Open-ILS/src/sql/Pg/version-upgrade/pines-post-3.2-upgrade.sql b/Open-ILS/src/sql/Pg/version-upgrade/pines-post-3.2-upgrade.sql index ef410369e3..67b447c4b1 100644 --- a/Open-ILS/src/sql/Pg/version-upgrade/pines-post-3.2-upgrade.sql +++ b/Open-ILS/src/sql/Pg/version-upgrade/pines-post-3.2-upgrade.sql @@ -144,11 +144,13 @@ VALUES ( ), ( 'ui.patron.edit.au.guardian.suggest', oils_i18n_gettext( - 'ui.patron.edit.au.guardian.suggest', - 'GUI: Suggest guardian field on patron registration', + 'ui.patron.edit.au.guardian.suggest', + 'GUI: Suggest guardian field on patron registration', + 'coust', 'label' + ), oils_i18n_gettext( - 'ui.patron.edit.au.guardian.suggest', - 'The guardian field will be suggested on the patron registration screen. Suggesting a field makes it appear when suggested fields are shown. If the field is shown or required this setting is ignored.', + 'ui.patron.edit.au.guardian.suggest', + 'The guardian field will be suggested on the patron registration screen. Suggesting a field makes it appear when suggested fields are shown. If the field is shown or required this setting is ignored.', 'coust', 'description'), 'bool' ), ( @@ -398,9 +400,9 @@ INSERT INTO actor.org_unit_setting (org_unit, name, value) VALUES (1, 'ui.patron.edit.au.guardian.suggest', 'true'), -- date formatting for web client (1, 'webstaff.format.dates', '"MM/dd/yyyy"'), -(1, 'webstaff.format.date_and_time', '"MM/dd/yyyy HH:mm"'), +(1, 'webstaff.format.date_and_time', '"MM/dd/yyyy HH:mm"') --, -- allow emailing records without logging in -(1, 'opac.email_record.allow_without_login', 'true') +--(1, 'opac.email_record.allow_without_login', 'true') ; -- move parent/guardian field data to new field @@ -408,162 +410,4 @@ UPDATE actor.usr SET guardian = ident_value2, ident_value2 = NULL WHERE NOT dele COMMIT; -BEGIN; - -ALTER TABLE actor.usr ADD COLUMN guardian TEXT; - -CREATE INDEX actor_usr_guardian_idx - ON actor.usr (evergreen.lowercase(guardian)); -CREATE INDEX actor_usr_guardian_unaccent_idx - ON actor.usr (evergreen.unaccent_and_squash(guardian)); - --- Modify auditor tables accordingly. -SELECT auditor.update_auditors(); - --- clear the guardian field on delete -CREATE OR REPLACE FUNCTION actor.usr_delete( - src_usr IN INTEGER, - dest_usr IN INTEGER -) RETURNS VOID AS $$ -DECLARE - old_profile actor.usr.profile%type; - old_home_ou actor.usr.home_ou%type; - new_profile actor.usr.profile%type; - new_home_ou actor.usr.home_ou%type; - new_name text; - new_dob actor.usr.dob%type; -BEGIN - SELECT - id || '-PURGED-' || now(), - profile, - home_ou, - dob - INTO - new_name, - old_profile, - old_home_ou, - new_dob - FROM - actor.usr - WHERE - id = src_usr; - -- - -- Quit if no such user - -- - IF old_profile IS NULL THEN - RETURN; - END IF; - -- - perform actor.usr_purge_data( src_usr, dest_usr ); - -- - -- Find the root grp_tree and the root org_unit. This would be simpler if we - -- could assume that there is only one root. Theoretically, someday, maybe, - -- there could be multiple roots, so we take extra trouble to get the right ones. - -- - SELECT - id - INTO - new_profile - FROM - permission.grp_ancestors( old_profile ) - WHERE - parent is null; - -- - SELECT - id - INTO - new_home_ou - FROM - actor.org_unit_ancestors( old_home_ou ) - WHERE -(SELECT id FROM permission.grp_tree WHERE name = 'LocalAdmin'), -(SELECT id FROM permission.perm_list WHERE code = 'MARK_ITEM_DISCARD'), -1 -), -( -(SELECT id FROM permission.grp_tree WHERE name = 'LibraryManager'), -(SELECT id FROM permission.perm_list WHERE code = 'MARK_ITEM_DISCARD'), -2 -), -( -(SELECT id FROM permission.grp_tree WHERE name = 'SuperCat'), -(SELECT id FROM permission.perm_list WHERE code = 'MARK_ITEM_DISCARD'), -0 -), -( -(SELECT id FROM permission.grp_tree WHERE name = 'Cat1'), -(SELECT id FROM permission.perm_list WHERE code = 'MARK_ITEM_DISCARD'), -1 -), -( -(SELECT id FROM permission.grp_tree WHERE name = 'Cat2'), -(SELECT id FROM permission.perm_list WHERE code = 'MARK_ITEM_DISCARD'), -1 -), -( -(SELECT id FROM permission.grp_tree WHERE name = 'Cat3'), -(SELECT id FROM permission.perm_list WHERE code = 'MARK_ITEM_DISCARD'), -1 -), -( -(SELECT id FROM permission.grp_tree WHERE name = 'Circ1'), -(SELECT id FROM permission.perm_list WHERE code = 'MARK_ITEM_DISCARD'), -1 -), -( -(SELECT id FROM permission.grp_tree WHERE name = 'Circ2'), -(SELECT id FROM permission.perm_list WHERE code = 'MARK_ITEM_DISCARD'), -1 -), --- copy delete warning override for discard/weed feature to work -( -(SELECT id FROM permission.grp_tree WHERE name = 'Circ1'), -(SELECT id FROM permission.perm_list WHERE code = 'COPY_DELETE_WARNING.override'), -1 -), -( -(SELECT id FROM permission.grp_tree WHERE name = 'SuperCat'), -(SELECT id FROM permission.perm_list WHERE code = 'COPY_DELETE_WARNING.override'), -0 -) -; - ---need to set grantable for these perms/groups -INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) -VALUES ( -(SELECT id FROM permission.grp_tree WHERE name = 'GlobalAdmin'), -(SELECT id FROM permission.perm_list WHERE code = 'COPY_DELETE_WARNING.override'), -0, -TRUE -), -( -(SELECT id FROM permission.grp_tree WHERE name = 'LibraryManager'), -(SELECT id FROM permission.perm_list WHERE code = 'COPY_DELETE_WARNING.override'), -1, -TRUE -) -; - --- allow multiple email addresses to be entered in patron reg form -UPDATE actor.org_unit_setting SET value = '"[^@<> ]+@[^@<> ]+\\.[^@.*<> ]{2,}"' WHERE name = 'ui.patron.edit.au.email.regex' and org_unit = 1; - --- settings -INSERT INTO actor.org_unit_setting (org_unit, name, value) VALUES --- new setting for max duplicate holds -(1, 'circ.holds.max_duplicate_holds', '"20"'), --- settings for parent/guardian field -(1, 'ui.patron.edit.guardian_required_for_juv', 'true'), -(1, 'ui.patron.edit.au.guardian.show', 'true'), -(1, 'ui.patron.edit.au.guardian.suggest', 'true'), --- date formatting for web client -(1, 'webstaff.format.dates', '"MM/dd/yyyy"'), -(1, 'webstaff.format.date_and_time', '"MM/dd/yyyy HH:mm"'), --- allow emailing records without logging in -(1, 'opac.email_record.allow_without_login', 'true') -; - --- move parent/guardian field data to new field -UPDATE actor.usr SET guardian = ident_value2, ident_value2 = NULL WHERE NOT deleted AND ident_value2 IS NOT NULL AND ident_value2 <> ''; - -COMMIT; -- 2.11.0