From 4299088805334a8ceeee402c756a292b9c597779 Mon Sep 17 00:00:00 2001 From: Jason Boyer Date: Fri, 11 Sep 2020 12:43:20 -0400 Subject: [PATCH] LP1849212: Correct upgrade script Re-align permission ids and correct syntax errors in the course reserves upgrade script. I'm not convinced the boolean_facet metabib class should exist simply to add "course reserves, Y/N?" and in any case can not function as is because adding metabib field classes requires additional field_entry tables which are missing from the seed data and upgrade script. --- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 2 +- .../upgrade/XXXX.schema.course-materials-module.sql | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) 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 91f7878de9..5b6376bf17 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -1951,7 +1951,7 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES 'View booking resource types', 'ppl', 'description')), ( 622, 'VIEW_BOOKING_RESOURCE', oils_i18n_gettext(622, 'View booking resources', 'ppl', 'description')), - ( 623, 'MANAGE_RESERVES', oils_i18n_gettext(623, + ( 624, 'MANAGE_RESERVES', oils_i18n_gettext(624, 'Allows user to manage Courses, Course Materials, and associate Users with Courses.', 'ppl', 'description')) ; diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.course-materials-module.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.course-materials-module.sql index 479d132acc..70699bbe5d 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.course-materials-module.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.course-materials-module.sql @@ -8,7 +8,7 @@ CREATE TABLE asset.course_module_course ( course_number TEXT NOT NULL, section_number TEXT, owning_lib INT REFERENCES actor.org_unit (id), - is_archived BOOLEAN NOT NULL DEFAULT false; + is_archived BOOLEAN NOT NULL DEFAULT false ); CREATE TABLE asset.course_module_role ( @@ -61,17 +61,17 @@ CREATE TABLE asset.course_module_term_course_map ( INSERT INTO permission.perm_list(id, code, description) VALUES ( - 620, + 624, 'MANAGE_RESERVES', oils_i18n_gettext( - 620, + 624, 'Allows user to manage Courses, Course Materials, and associate Users with Courses.', 'ppl', 'description' ) ); -INSERT INTO permission.grp_perm_map(perm, grp, depth) VALUES (620, 9, 0), (620, 11, 0), (20, 12, 0), (620, 13, 0); +INSERT INTO permission.grp_perm_map(perm, grp, depth) VALUES (624, 9, 0), (624, 11, 0), (20, 12, 0), (624, 13, 0); INSERT INTO config.org_unit_setting_type (grp, name, datatype, label, description, fm_class) @@ -86,7 +86,7 @@ VALUES ( ), oils_i18n_gettext( 'circ.course_materials_opt_in', - 'If enabled, the Org Unit will utilize Course Material functionality.' + 'If enabled, the Org Unit will utilize Course Material functionality.', 'coust', 'description' ), null @@ -101,7 +101,7 @@ VALUES ( ), oils_i18n_gettext( 'circ.course_materials_browse_by_instructor', - 'If enabled, the Org Unit will allow OPAC users to browse Courses by instructor name.' + 'If enabled, the Org Unit will allow OPAC users to browse Courses by instructor name.', 'coust', 'description' ), null @@ -194,6 +194,14 @@ BEGIN RETURN NEW; END; $func$ LANGUAGE plpgsql; + +CREATE OR REPLACE FUNCTION biblio.course_reserves_facet () RETURNS TRIGGER AS $func$ +BEGIN + PERFORM asset.update_course_reserves_facet(NEW.id, NEW.id); + RETURN NEW; +END; +$func$ LANGUAGE plpgsql; + CREATE TRIGGER course_reserves_facet AFTER INSERT OR UPDATE ON biblio.record_entry FOR EACH ROW EXECUTE PROCEDURE biblio.course_reserves_facet (); -- 2.11.0