From 070c37a3b0d5bc26454d3be3a7183124eb7fa989 Mon Sep 17 00:00:00 2001 From: Jason Boyer Date: Sat, 10 Nov 2018 17:53:16 -0500 Subject: [PATCH] LP1802682: Use Default Net Access Level OUS This branch does two things: makes use of the OUS that determines the default Net Access Level, and also changes the type of the coust entry to make using it more user friendly. Signed-off-by: Jason Boyer Signed-off-by: Terran McCanna Signed-off-by: Galen Charlton --- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 2 +- Open-ILS/src/sql/Pg/upgrade/XXXX.data.cnal_ous_type.sql | 8 ++++++++ Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.cnal_ous_type.sql 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 df6bda7ae1..f3eba61b7f 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -4801,7 +4801,7 @@ INSERT into config.org_unit_setting_type oils_i18n_gettext('ui.patron.default_inet_access_level', 'Default level of patrons'' internet access', 'coust', 'description'), - 'integer', null) + 'link', 'cnal') ,( 'ui.patron.edit.au.active.show', 'gui', oils_i18n_gettext('ui.patron.edit.au.active.show', diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.cnal_ous_type.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.cnal_ous_type.sql new file mode 100644 index 0000000000..ba3a5a7959 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.cnal_ous_type.sql @@ -0,0 +1,8 @@ +BEGIN; + +SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); + +UPDATE config.org_unit_setting_type SET fm_class='cnal', datatype='link' WHERE name='ui.patron.default_inet_access_level'; + +COMMIT; + diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js index 704e583cdd..c0913001ed 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js @@ -861,6 +861,7 @@ angular.module('egCoreMod') card : card, cards : [card], home_ou : egCore.org.get(egCore.auth.user().ws_ou()), + net_access_level : service.org_settings['ui.patron.default_inet_access_level'], stat_cat_entries : [], waiver_entries : [], groups : [], -- 2.11.0