From e4235f82ae1f749d7f025ac384ff26a31126efe1 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 24 May 2018 16:00:32 -0400 Subject: [PATCH] LP#1750894 Org-only trumps local settings Signed-off-by: Bill Erickson --- Open-ILS/web/js/ui/default/staff/services/hatch.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Open-ILS/web/js/ui/default/staff/services/hatch.js b/Open-ILS/web/js/ui/default/staff/services/hatch.js index bc9be012af..12a25f7cde 100644 --- a/Open-ILS/web/js/ui/default/staff/services/hatch.js +++ b/Open-ILS/web/js/ui/default/staff/services/hatch.js @@ -366,8 +366,12 @@ angular.module('egCoreMod') // If we have already attempted to retrieve a value for this // setting, then we can tell up front whether applying a value // at the server will be an option. If not, store locally. + // Note that the existence of an org unit setting type and no + // user/ws setting type means applying a value locally is + // not allowed. var summary = service.serverSettingSummaries[key]; if (summary && + summary.has_org_setting() === 'f' && summary.has_user_setting() === 'f' && summary.has_workstation_setting() === 'f') { @@ -431,7 +435,11 @@ angular.module('egCoreMod') return $q.when(service.keyCache[key] = val); } - if (summary.has_user_setting() === 'f' && + // Note that the existence of an org unit setting type and no + // user/ws setting type means applying a value locally is + // not allowed. + if (summary.has_org_setting() === 'f' && + summary.has_user_setting() === 'f' && summary.has_workstation_setting() === 'f') { console.warn('No server setting type exists for ' -- 2.11.0