add support for typed user settings as a prereq for opt-in on selected trigger defini...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@14905 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 87f0e24..870131a 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -51,7 +51,7 @@ CREATE TABLE config.upgrade_log (
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0081'); -- berick
+INSERT INTO config.upgrade_log (version) VALUES ('0082'); -- miker
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,
@@ -564,6 +564,30 @@ CREATE TABLE config.org_unit_setting_type (
       ( datatype <> 'link' AND fm_class IS NULL ) )
 );
 
+CREATE TABLE config.usr_setting_type (
+
+    name TEXT PRIMARY KEY,
+    opac_visible BOOL NOT NULL DEFAULT FALSE,
+    label TEXT UNIQUE NOT NULL,
+    description TEXT,
+    datatype TEXT NOT NULL DEFAULT 'string',
+    fm_class TEXT,
+
+    --
+    -- define valid datatypes
+    --
+    CONSTRAINT coust_valid_datatype CHECK ( datatype IN
+    ( 'bool', 'integer', 'float', 'currency', 'interval',
+        'date', 'string', 'object', 'array', 'link' ) ),
+
+    --
+    -- fm_class is meaningful only for 'link' datatype
+    --
+    CONSTRAINT coust_no_empty_link CHECK
+    ( ( datatype = 'link' AND fm_class IS NOT NULL ) OR
+        ( datatype <> 'link' AND fm_class IS NULL ) )
+
+);
 
 -- Some handy functions, based on existing ones, to provide optional ingest normalization
 

diff --git a/Open-ILS/src/sql/Pg/005.schema.actors.sql b/Open-ILS/src/sql/Pg/005.schema.actors.sql
index 5f1bb3f..81eb7a7 100644 (file)
--- a/Open-ILS/src/sql/Pg/005.schema.actors.sql
+++ b/Open-ILS/src/sql/Pg/005.schema.actors.sql
@@ -150,7 +150,7 @@ CREATE INDEX actor_usr_note_creator_idx ON actor.usr_note ( creator );
 CREATE TABLE actor.usr_setting (
        id      BIGSERIAL       PRIMARY KEY,
        usr     INT             NOT NULL REFERENCES actor.usr ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-       name    TEXT            NOT NULL,
+       name    TEXT            NOT NULL REFERENCES config.usr_setting_type (name) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
        value   TEXT            NOT NULL,
        CONSTRAINT usr_once_per_key UNIQUE (usr,name)
 );

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 a43cdb3..d4ec9cf 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1458,6 +1458,33 @@ INSERT INTO config.circ_matrix_matchpoint (org_unit,grp,duration_rule,recurring_
 -- hold matrix - 110.hold_matrix.sql:
 INSERT INTO config.hold_matrix_matchpoint (requestor_grp) VALUES (1);
 
+
+-- User setting types
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    VALUES ('opac.default_font', TRUE, 'OPAC Font Size', 'OPAC Font Size', 'string');
+
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    VALUES ('opac.default_search_depth', TRUE, 'OPAC Search Depth', 'OPAC Search Depth', 'integer');
+
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    VALUES ('opac.default_search_location', TRUE, 'OPAC Search Location', 'OPAC Search Location', 'integer');
+
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    VALUES ('opac.hits_per_page', TRUE, 'Hits per Page', 'Hits per Page', 'string');
+
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    VALUES ('opac.hold_notify', TRUE, 'Hold Notification Format', 'Hold Notification Format', 'string');
+
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    VALUES ('staff_client.catalog.record_view.default', TRUE, 'Default Record View', 'Default Record View', 'string');
+
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    VALUES ('staff_client.copy_editor.templates', TRUE, 'Copy Editor Template', 'Copy Editor Template', 'object');
+
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    VALUES ('circ.holds_behind_desk', FALSE, 'Hold is behind Circ Desk', 'Hold is behind Circ Desk', 'bool');
+
+
 -- org_unit setting types
 INSERT into config.org_unit_setting_type
 ( name, label, description, datatype ) VALUES

diff --git a/Open-ILS/src/sql/Pg/upgrade/0082.schema.user_setting_types.sql b/Open-ILS/src/sql/Pg/upgrade/0082.schema.user_setting_types.sql
new file mode 100644 (file)
index 0000000..b6ebeec
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0082.schema.user_setting_types.sql
@@ -0,0 +1,77 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0082'); -- miker
+
+CREATE TABLE config.usr_setting_type (
+
+    name TEXT PRIMARY KEY,
+    opac_visible BOOL NOT NULL DEFAULT FALSE,
+    label TEXT UNIQUE NOT NULL,
+    description TEXT,
+    datatype TEXT NOT NULL DEFAULT 'string',
+    fm_class TEXT,
+
+    --
+    -- define valid datatypes
+    --
+    CONSTRAINT coust_valid_datatype CHECK ( datatype IN
+    ( 'bool', 'integer', 'float', 'currency', 'interval',
+        'date', 'string', 'object', 'array', 'link' ) ),
+
+    --
+    -- fm_class is meaningful only for 'link' datatype
+    --
+    CONSTRAINT coust_no_empty_link CHECK
+    ( ( datatype = 'link' AND fm_class IS NOT NULL ) OR
+        ( datatype <> 'link' AND fm_class IS NULL ) )
+
+);
+
+-- Yeah, this is data, but I need it for the schema bit at the end
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    VALUES ('opac.default_font', TRUE, 'OPAC Font Size', 'OPAC Font Size', 'string');
+
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    VALUES ('opac.default_search_depth', TRUE, 'OPAC Search Depth', 'OPAC Search Depth', 'integer');
+
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    VALUES ('opac.default_search_location', TRUE, 'OPAC Search Location', 'OPAC Search Location', 'integer');
+
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    VALUES ('opac.hits_per_page', TRUE, 'Hits per Page', 'Hits per Page', 'string');
+
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    VALUES ('opac.hold_notify', TRUE, 'Hold Notification Format', 'Hold Notification Format', 'string');
+
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    VALUES ('staff_client.catalog.record_view.default', TRUE, 'Default Record View', 'Default Record View', 'string');
+
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    VALUES ('staff_client.copy_editor.templates', TRUE, 'Copy Editor Template', 'Copy Editor Template', 'object');
+
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    VALUES ('circ.holds_behind_desk', FALSE, 'Hold is behind Circ Desk', 'Hold is behind Circ Desk', 'bool');
+
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+    SELECT  DISTINCT name, FALSE, name, name, 'string'
+      FROM  actor.usr_setting
+      WHERE name NOT IN (
+                'circ.holds_behind_desk',
+                'opac.default_font',
+                'opac.default_search_depth',
+                'opac.default_search_location',
+                'opac.hits_per_page',
+                'opac.hold_notify',
+                'staff_client.catalog.record_view.default',
+                'staff_client.copy_editor.templates'
+            );
+
+
+ATLER TABLE actor.usr_setting
+    ADD CONSTRAINT user_setting_type_fkey
+    FOREIGN KEY (name) REFERENCES config.usr_setting_type (name) 
+    ON DELETE CASCADE ON UPDATE CASCADE
+    DEFERRABLE INITIALLY DEFERRED;
+
+COMMIT;
+