From: Bill Erickson Date: Fri, 16 Sep 2016 17:53:34 +0000 (-0400) Subject: JBAS-1586 Teach Ecard new profile X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4f0f199e132f9af8f4ef0c4f4656360b95812783;p=working%2FEvergreen.git JBAS-1586 Teach Ecard new profile * Entry for permission.grp_tree * Hold policy configuration to prevent holds for new profile * Entry in patron editor UI for sorting the new profile in the group selector. Signed-off-by: Bill Erickson --- diff --git a/KCLS/sql/schema/deploy/teacher-group.sql b/KCLS/sql/schema/deploy/teacher-group.sql new file mode 100644 index 0000000000..c4c4a5190b --- /dev/null +++ b/KCLS/sql/schema/deploy/teacher-group.sql @@ -0,0 +1,27 @@ +-- Deploy kcls-evergreen:teacher-group to pg +-- requires: student-groups + +BEGIN; + +DO $$ +BEGIN + IF evergreen.insert_on_deploy() THEN + + INSERT INTO permission.grp_tree + (id, name, parent, usergroup, perm_interval) VALUES + (903, 'Teacher Ecard', 900, TRUE, '2 years'); + + -- hold matchpoints have to match the group exactly to overcome + -- conflicting match weights. + INSERT INTO config.hold_matrix_matchpoint ( + active, usr_grp, requestor_grp, ref_flag, holdable, + distance_is_from_owner, include_frozen_holds, stop_blocked_user, + strict_ou_match + ) VALUES (TRUE, 903, 1, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE); + + END IF; -- insert_on_deploy +END $$; + + + +COMMIT; diff --git a/KCLS/sql/schema/revert/teacher-group.sql b/KCLS/sql/schema/revert/teacher-group.sql new file mode 100644 index 0000000000..97fd465127 --- /dev/null +++ b/KCLS/sql/schema/revert/teacher-group.sql @@ -0,0 +1,15 @@ +-- Revert kcls-evergreen:teacher-group from pg + +BEGIN; + +DO $$ +BEGIN + IF evergreen.insert_on_deploy() THEN + + DELETE FROM config.hold_matrix_matchpoint WHERE usr_grp = 903; + DELETE FROM permission.grp_tree WHERE id = 903; + + END IF; -- insert-on-deploy +END $$; + +COMMIT; diff --git a/KCLS/sql/schema/sqitch.plan b/KCLS/sql/schema/sqitch.plan index 9307f30ff9..52cad6b20f 100644 --- a/KCLS/sql/schema/sqitch.plan +++ b/KCLS/sql/schema/sqitch.plan @@ -31,3 +31,4 @@ payflow-hosted-org-settings [vand-auth-edit-date] 2016-07-06T18:39:40Z Bill Eric sip-act-type-freegalsip [payflow-hosted-org-settings] 2016-08-19T20:24:01Z Bill Erickson # User activity type for freegalsip login audit-table-maint [payflow-hosted-org-settings] 2016-07-22T14:49:08Z Bill Erickson # Audit table cleanup functions payflow-hosted-static-silent-post-url [payflow-hosted-org-settings] 2016-08-17T13:14:48Z Bill Erickson # Fall back to PP silent post URL +teacher-group [student-groups] 2016-09-16T17:43:41Z Bill Erickson # Teach ecard group and policy configs diff --git a/KCLS/sql/schema/verify/teacher-group.sql b/KCLS/sql/schema/verify/teacher-group.sql new file mode 100644 index 0000000000..b7422b836f --- /dev/null +++ b/KCLS/sql/schema/verify/teacher-group.sql @@ -0,0 +1,7 @@ +-- Verify kcls-evergreen:teacher-group on pg + +BEGIN; + +-- XXX Add verifications here. + +ROLLBACK; diff --git a/Open-ILS/web/js/ui/default/actor/user/register.js b/Open-ILS/web/js/ui/default/actor/user/register.js index cb018d9ae9..30a12afaaf 100644 --- a/Open-ILS/web/js/ui/default/actor/user/register.js +++ b/Open-ILS/web/js/ui/default/actor/user/register.js @@ -1415,6 +1415,7 @@ function trimGrpTree(autoWidget) { 35, //Outreach Service 34, //Outreach Staff Only 901, //Student Ecard + 903, //Teacher Ecard 902, //Classroom Databases 40, //ILL 89, //CMS Recall 89