From 0584c40feb01c666e82e0ff3ac178a3cbeea5991 Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Tue, 21 Feb 2017 07:23:42 -0500 Subject: [PATCH] LP#1612752 - Do not clobber local perm description changes. Signed-off-by: Chris Sharp Signed-off-by: Bill Erickson Signed-off-by: Galen Charlton --- ...XXXX-create-transit-cancel-time-column.sql | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX-create-transit-cancel-time-column.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX-create-transit-cancel-time-column.sql index a2709f6309..57766f5888 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX-create-transit-cancel-time-column.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX-create-transit-cancel-time-column.sql @@ -5,10 +5,21 @@ SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); ALTER TABLE action.transit_copy ADD COLUMN cancel_time TIMESTAMPTZ; --- change "abort" to "cancel" in perm descriptions -UPDATE permission.perm_list SET description = 'Allow a user to cancel a copy transit if the user is at the transit destination or source' WHERE code = 'ABORT_TRANSIT'; -UPDATE permission.perm_list SET description = 'Allow a user to cancel a copy transit if the user is not at the transit source or dest' WHERE code = 'ABORT_REMOTE_TRANSIT'; -UPDATE permission.perm_list SET description = 'Allows a user to cancel a transit on a copy with status of LOST' WHERE code = 'ABORT_TRANSIT_ON_LOST'; -UPDATE permission.perm_list SET description = 'Allows a user to cancel a transit on a copy with status of MISSING' WHERE code = 'ABORT_TRANSIT_ON_MISSING'; - +-- change "abort" to "cancel" in stock perm descriptions +UPDATE permission.perm_list + SET description = 'Allow a user to cancel a copy transit if the user is at the transit destination or source' + WHERE code = 'ABORT_TRANSIT' + AND description = 'Allow a user to abort a copy transit if the user is at the transit destination or source'; +UPDATE permission.perm_list + SET description = 'Allow a user to cancel a copy transit if the user is not at the transit source or dest' + WHERE code = 'ABORT_REMOTE_TRANSIT' + AND description = 'Allow a user to abort a copy transit if the user is not at the transit source or dest'; +UPDATE permission.perm_list + SET description = 'Allows a user to cancel a transit on a copy with status of LOST' + WHERE code = 'ABORT_TRANSIT_ON_LOST' + AND description = 'Allows a user to abort a transit on a copy with status of LOST'; +UPDATE permission.perm_list + SET description = 'Allows a user to cancel a transit on a copy with status of MISSING' + WHERE code = 'ABORT_TRANSIT_ON_MISSING' + AND description = 'Allows a user to abort a transit on a copy with status of MISSING'; COMMIT; -- 2.43.2