From: Bill Erickson Date: Mon, 19 Mar 2018 18:43:27 +0000 (-0400) Subject: LP#1750894 Unified org/usr/ws settings / WIP X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=d1970ffdf44da56a29d57bd6cfd027592425926f;p=working%2FEvergreen.git LP#1750894 Unified org/usr/ws settings / WIP Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.workstation-settings.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.workstation-settings.sql index 7b77369d4b..59b33d175e 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.workstation-settings.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.workstation-settings.sql @@ -11,6 +11,8 @@ CREATE TABLE config.setting_type ( fm_class TEXT, view_perm INT, update_perm INT, + reg_default TEXT, -- TODO: replace w/ org setting as default? + opac_visible BOOLEAN NOT NULL DEFAULT FALSE, -- user settings only org_setting BOOLEAN NOT NULL DEFAULT FALSE, usr_setting BOOLEAN NOT NULL DEFAULT FALSE, @@ -56,9 +58,10 @@ SELECT name, label, grp, description, datatype, FROM config.org_unit_setting_type; -- move user settings into the new table -INSERT INTO config.setting_type - (name, label, grp, description, datatype, fm_class, usr_setting) -SELECT name, label, grp, description, datatype, fm_class, TRUE +INSERT INTO config.setting_type (name, label, grp, description, + datatype, fm_class, reg_default, opac_visible, usr_setting) +SELECT name, label, grp, description, + datatype, fm_class, reg_default, opac_visible, TRUE FROM config.usr_setting_type; -- Move foreign keys from config.*_setting_type to config.setting_type @@ -102,7 +105,8 @@ CREATE VIEW config.org_unit_setting_type AS FROM config.setting_type WHERE org_setting; CREATE VIEW config.usr_setting_type AS - SELECT name, label, grp, description, datatype, fm_class + SELECT name, label, grp, description, datatype, + fm_class, reg_default, opac_visible FROM config.setting_type WHERE usr_setting; CREATE OR REPLACE FUNCTION actor.setting_type_is_valid()