From c8661f7ef8c50e2f498e47aadda093ff64b424e2 Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Sun, 10 Nov 2019 14:31:48 -0500 Subject: [PATCH] LP#1842297 - Add ADMIN_OPENATHENS perm to perm list Signed-off-by: Chris Sharp Signed-off-by: Jane Sandberg --- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/800.fkeys.sql | 4 ++++ Open-ILS/src/sql/Pg/950.data.seed-values.sql | 4 +++- Open-ILS/src/sql/Pg/upgrade/XXXX.schema.openathens_identity.sql | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index d490989f03..5c06631edd 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -1405,7 +1405,7 @@ SELECT SETVAL('config.openathens_name_field_id_seq'::TEXT, 100); CREATE TABLE config.openathens_identity ( id SERIAL PRIMARY KEY, active BOOL NOT NULL DEFAULT true, - org_unit INT NOT NULL REFERENCES actor.org_unit (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, + org_unit INT NOT NULL, -- REFERENCES actor.org_unit (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, api_key TEXT NOT NULL, connection_id TEXT NOT NULL, connection_uri TEXT NOT NULL, diff --git a/Open-ILS/src/sql/Pg/800.fkeys.sql b/Open-ILS/src/sql/Pg/800.fkeys.sql index 58181cb21d..4d23c97591 100644 --- a/Open-ILS/src/sql/Pg/800.fkeys.sql +++ b/Open-ILS/src/sql/Pg/800.fkeys.sql @@ -256,6 +256,10 @@ ALTER TABLE asset.copy_template ADD CONSTRAINT asset_copy_template_floating_fkey ALTER TABLE config.marc_field ADD CONSTRAINT config_marc_field_owner_fkey FOREIGN KEY (owner) REFERENCES actor.org_unit(id) DEFERRABLE INITIALLY DEFERRED; ALTER TABLE config.marc_subfield ADD CONSTRAINT config_marc_subfield_owner_fkey FOREIGN KEY (owner) REFERENCES actor.org_unit(id) DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE config.openathens_identity ADD CONSTRAINT config_openathens_identity_ou_fkey +FOREIGN KEY (org_unit) REFERENCES actor.org_unit (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED; + + ALTER TABLE config.copy_tag_type ADD CONSTRAINT copy_tag_type_owner_fkey FOREIGN KEY (owner) REFERENCES actor.org_unit(id) DEFERRABLE INITIALLY DEFERRED; ALTER TABLE config.print_template ADD CONSTRAINT cpt_owner_fkey 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 b6959bb20e..3af7ddbb49 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -1939,7 +1939,9 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES ( 621, 'VIEW_BOOKING_RESOURCE_TYPE', oils_i18n_gettext(621, 'View booking resource types', 'ppl', 'description')), ( 622, 'VIEW_BOOKING_RESOURCE', oils_i18n_gettext(622, - 'View booking resources', 'ppl', 'description')) + 'View booking resources', 'ppl', 'description')), + ( 623, 'ADMIN_OPENATHENS', oils_i18n_gettext(623, + 'Allow a user to administer OpenAthens authentication service', 'ppl', 'description')) ; diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.openathens_identity.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.openathens_identity.sql index e43010d478..9f070147fb 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.openathens_identity.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.openathens_identity.sql @@ -51,4 +51,9 @@ CREATE TABLE config.openathens_identity ( release_home_ou BOOL NOT NULL DEFAULT false ); + +INSERT INTO permission.perm_list ( id, code, description) VALUES + ( 623, 'ADMIN_OPENATHENS', oils_i18n_gettext(623, + 'Allow a user to administer OpenAthens authentication service', 'ppl', 'description')); + COMMIT; -- 2.11.0