[open-ils-commits] [GIT] Evergreen ILS branch rel_2_11 updated. f52d6b649d5fe4b63cc6a1fe8c6dcc350acb9636
Evergreen Git
git at git.evergreen-ils.org
Sat May 6 14:24:52 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, rel_2_11 has been updated
via f52d6b649d5fe4b63cc6a1fe8c6dcc350acb9636 (commit)
via 6e25dd15520cd643ddea40a4231827f1a949027a (commit)
from 73c617f630b2d1c157a2d605c2b05a812b478837 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f52d6b649d5fe4b63cc6a1fe8c6dcc350acb9636
Author: Jason Stephenson <jason at sigio.com>
Date: Sat May 6 14:16:57 2017 -0400
LP#1378829 Stamp Upgrade Script & Add Release Note
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index a719054..f83695c 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,7 @@ CREATE TRIGGER no_overlapping_deps
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 ('1030', :eg_version); -- dbs/kmlussier
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1037', :eg_version); -- jeff/dyrcona
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_long_overdue_perm.sql b/Open-ILS/src/sql/Pg/upgrade/1037.data.fix_long_overdue_perm.sql
similarity index 98%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_long_overdue_perm.sql
rename to Open-ILS/src/sql/Pg/upgrade/1037.data.fix_long_overdue_perm.sql
index 795f328..9a9cdd6 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_long_overdue_perm.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1037.data.fix_long_overdue_perm.sql
@@ -7,7 +7,7 @@ BEGIN;
-- check whether patch can be applied
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); -- jeff
+SELECT evergreen.upgrade_deps_block_check('1037', :eg_version); -- jeff
-- For some time now, the database seed data / upgrade scripts have created
-- a permission with id 549 and code COPY_STATUS_LONGOVERDUE.override, while
diff --git a/docs/RELEASE_NOTES_NEXT/Administration/fix_copy_status_long_overdue_override_permission_typo.adoc b/docs/RELEASE_NOTES_NEXT/Administration/fix_copy_status_long_overdue_override_permission_typo.adoc
new file mode 100644
index 0000000..396cfb7
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Administration/fix_copy_status_long_overdue_override_permission_typo.adoc
@@ -0,0 +1,7 @@
+Fix COPY_STATUS_LONGOVERDUE.override Permission Typo
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The existing permission was incorrectly created with a code of
+COPY_STATUS_LONGOVERDUE.override, while the event thrown requires a
+permission with a code of COPY_STATUS_LONG_OVERDUE.override. This
+update changes the permission code to match what the event requires.
+
commit 6e25dd15520cd643ddea40a4231827f1a949027a
Author: Jeff Godin <jgodin at tadl.org>
Date: Fri Apr 14 10:21:40 2017 -0400
LP#1378829 Fix long overdue override permission
Fix override permission used when checking in a copy that is "long
overdue".
The existing permission was incorrectly created with a code of
COPY_STATUS_LONGOVERDUE.override, while the event thrown requires a
permission with a code of COPY_STATUS_LONG_OVERDUE.override
This commit updates the seed data and a few references to the
old/incorrect permission in documentation, and also includes an
upgrade script designed to accommodate the various likely ways in
which sites may have already locally addressed this issue.
A simple pgtap test is also included.
Signed-off-by: Jeff Godin <jgodin at tadl.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index daaee13..465e94f 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1573,7 +1573,7 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
'When granted, newly added lineitem identifiers will propagate to linked bib records', 'ppl', 'description')),
( 548, 'ACQ_SET_LINEITEM_IDENTIFIER', oils_i18n_gettext(548,
'Allows staff to change the lineitem identifier', 'ppl', 'description')),
- ( 549, 'COPY_STATUS_LONGOVERDUE.override', oils_i18n_gettext(549,
+ ( 549, 'COPY_STATUS_LONG_OVERDUE.override', oils_i18n_gettext(549,
'Allows the user to check-in long-overdue items, prompting ' ||
'long-overdue check-in processing', 'ppl', 'code')),
( 550, 'SET_CIRC_LONG_OVERDUE', oils_i18n_gettext(550,
diff --git a/Open-ILS/src/sql/Pg/t/regress/lp1378829_fix_long_overdue_perm.pg b/Open-ILS/src/sql/Pg/t/regress/lp1378829_fix_long_overdue_perm.pg
new file mode 100644
index 0000000..0753c7e
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/t/regress/lp1378829_fix_long_overdue_perm.pg
@@ -0,0 +1,11 @@
+BEGIN;
+
+SELECT plan(1);
+
+SELECT is( code, 'COPY_STATUS_LONG_OVERDUE.override', 'Long overdue override perm is correct' )
+FROM permission.perm_list
+WHERE id = 549;
+
+SELECT * from finish();
+
+ROLLBACK;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_long_overdue_perm.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_long_overdue_perm.sql
new file mode 100644
index 0000000..795f328
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_long_overdue_perm.sql
@@ -0,0 +1,101 @@
+-- Evergreen DB patch XXXX.data.fix_long_overdue_perm.sql
+--
+-- Update permission 549 to have a "code" value that matches what
+-- the Perl code references
+--
+BEGIN;
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); -- jeff
+
+-- For some time now, the database seed data / upgrade scripts have created
+-- a permission with id 549 and code COPY_STATUS_LONGOVERDUE.override, while
+-- the Perl code references a permission with code
+-- COPY_STATUS_LONG_OVERDUE.override
+--
+-- Below, we attempt to handle at least three possible database states:
+--
+-- 1) no corrective action has been taken, permission exists with id 549 and
+-- code COPY_STATUS_LONGOVERDUE.override
+--
+-- 2) permission with id 549 has already been updated to have code
+-- COPY_STATUS_LONG_OVERDUE.override
+--
+-- 3) new permission with unknown id and code COPY_STATUS_LONG_OVERDUE.override
+-- has been added, and potentially assigned to users/groups
+--
+-- In the case of 3, users and groups may have been assigned both perm id 549
+-- and the local permission of unknown id.
+--
+-- The desired end result is that we should have a permission.perm_list
+-- entry with id 549 and code COPY_STATUS_LONG_OVERDUE.override,
+-- any locally-created permission with that same code but a different id
+-- is deleted, and any users or groups that had been granted that locally-created
+-- permission (by id) have been granted permission id 549 if not already granted.
+--
+-- If for some reason the permission at id 549 has an unexpected value for "code",
+-- the end result of this upgrade script should be a no-op.
+
+-- grant permission 549 to any group that
+-- has a potentially locally-added perm
+-- with code COPY_STATUS_LONG_OVERDUE.override
+WITH new_grp_perms AS (
+SELECT grp, 549 AS perm, depth, grantable
+FROM permission.grp_perm_map pgpm
+JOIN permission.perm_list ppl ON ppl.id = pgpm.perm
+WHERE ppl.code = 'COPY_STATUS_LONG_OVERDUE.override'
+-- short circuit if perm id 549 exists and doesn't have the expected code
+AND EXISTS (SELECT 1 FROM permission.perm_list ppl WHERE ppl.id = 549 and ppl.code = 'COPY_STATUS_LONGOVERDUE.override')
+-- don't try to assign perm 549 if already assigned
+AND NOT EXISTS (SELECT 1 FROM permission.grp_perm_map pgpm2 WHERE pgpm2.grp = pgpm.grp AND pgpm2.perm = 549)
+)
+INSERT INTO permission.grp_perm_map
+(grp, perm, depth, grantable)
+SELECT grp, perm, depth, grantable
+FROM new_grp_perms;
+
+-- grant permission 549 to any user that
+-- has a potentially locally-added perm
+-- with code COPY_STATUS_LONG_OVERDUE.override
+WITH new_usr_perms AS (
+SELECT usr, 549 AS perm, depth, grantable
+FROM permission.usr_perm_map pupm
+JOIN permission.perm_list ppl ON ppl.id = pupm.perm
+WHERE ppl.code = 'COPY_STATUS_LONG_OVERDUE.override'
+-- short circuit if perm id 549 exists and doesn't have the expected code
+AND EXISTS (SELECT 1 FROM permission.perm_list ppl WHERE ppl.id = 549 and ppl.code = 'COPY_STATUS_LONGOVERDUE.override')
+-- don't try to assign perm 549 if already assigned
+AND NOT EXISTS (SELECT 1 FROM permission.usr_perm_map pupm2 WHERE pupm2.usr = pupm.usr AND pupm2.perm = 549)
+)
+INSERT INTO permission.usr_perm_map
+(usr, perm, depth, grantable)
+SELECT usr, perm, depth, grantable
+FROM new_usr_perms;
+
+-- delete any group assignments of the locally-added perm
+DELETE FROM permission.grp_perm_map
+WHERE perm = (SELECT id FROM permission.perm_list WHERE code = 'COPY_STATUS_LONG_OVERDUE.override' AND id <> 549)
+-- short circuit if perm id 549 exists and doesn't have the expected code
+AND EXISTS (SELECT 1 FROM permission.perm_list ppl WHERE ppl.id = 549 and ppl.code = 'COPY_STATUS_LONGOVERDUE.override');
+
+-- delete any user assignments of the locally-added perm
+DELETE FROM permission.usr_perm_map
+WHERE perm = (SELECT id FROM permission.perm_list WHERE code = 'COPY_STATUS_LONG_OVERDUE.override' AND id <> 549)
+-- short circuit if perm id 549 exists and doesn't have the expected code
+AND EXISTS (SELECT 1 FROM permission.perm_list ppl WHERE ppl.id = 549 and ppl.code = 'COPY_STATUS_LONGOVERDUE.override');
+
+-- delete the locally-added perm, if any
+DELETE FROM permission.perm_list
+WHERE code = 'COPY_STATUS_LONG_OVERDUE.override'
+AND id <> 549
+-- short circuit if perm id 549 exists and doesn't have the expected code
+AND EXISTS (SELECT 1 FROM permission.perm_list ppl WHERE ppl.id = 549 and ppl.code = 'COPY_STATUS_LONGOVERDUE.override');
+
+-- update perm id 549 to the correct code, if not already
+UPDATE permission.perm_list
+SET code = 'COPY_STATUS_LONG_OVERDUE.override'
+WHERE id = 549
+AND code = 'COPY_STATUS_LONGOVERDUE.override';
+
+COMMIT;
diff --git a/docs/circulation/circulating_items.adoc b/docs/circulation/circulating_items.adoc
index 7f3fc0c..0cd332e 100644
--- a/docs/circulation/circulating_items.adoc
+++ b/docs/circulation/circulating_items.adoc
@@ -427,7 +427,7 @@ lost copy on the patron record when it is paid
The following permissions are related to this feature:
-* COPY_STATUS_LONGOVERDUE.override
+* COPY_STATUS_LONG_OVERDUE.override
** Allows the user to check-in long-overdue items thus removing the long-overdue
status on the item
diff --git a/docs/circulation/circulating_items_web_client.adoc b/docs/circulation/circulating_items_web_client.adoc
index 6db0950..3069b68 100644
--- a/docs/circulation/circulating_items_web_client.adoc
+++ b/docs/circulation/circulating_items_web_client.adoc
@@ -389,7 +389,7 @@ The following Library Settings enable you to set preferences related to long ove
The following permissions are related to this feature:
-* COPY_STATUS_LONGOVERDUE.override
+* COPY_STATUS_LONG_OVERDUE.override
** Allows the user to check-in long-overdue items thus removing the long-overdue status on the item
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 2 +-
.../t/regress/lp1378829_fix_long_overdue_perm.pg | 11 ++
.../Pg/upgrade/1037.data.fix_long_overdue_perm.sql | 101 ++++++++++++++++++++
...atus_long_overdue_override_permission_typo.adoc | 7 ++
docs/circulation/circulating_items.adoc | 2 +-
docs/circulation/circulating_items_web_client.adoc | 2 +-
7 files changed, 123 insertions(+), 4 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/t/regress/lp1378829_fix_long_overdue_perm.pg
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1037.data.fix_long_overdue_perm.sql
create mode 100644 docs/RELEASE_NOTES_NEXT/Administration/fix_copy_status_long_overdue_override_permission_typo.adoc
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list