From 6b7bb2a565cd700e2c3100f4d28a188fc01cff48 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 13 Jun 2019 09:26:12 +0200
Subject: [PATCH] add default parameter for custom config loading where needed
---
process/DataCaching_lib/process.js | 8 +++-----
process/WsValidation_lib/process.js | 12 ++++++------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/process/DataCaching_lib/process.js b/process/DataCaching_lib/process.js
index b154d8f222b..5eee5316c78 100644
--- a/process/DataCaching_lib/process.js
+++ b/process/DataCaching_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.vars");
import("system.project");
@@ -67,11 +68,8 @@ CachedData.prototype.load = function(pDataCallbackFunction)
cachingEnabled = false;
else
{
- try
- {
- if (JSON.parse(project.getInstanceConfigValue("custom.dataCaching.client.forceDisable")) == true)
- cachingEnabled = false;
- } catch (ex) {/* ignore */}
+ if (JSON.parse(project.getInstanceConfigValue("custom.dataCaching.client.forceDisable", "false")) == true)
+ cachingEnabled = false;
}
if (!cachingEnabled)
diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js
index 24c3432f752..ab6ee507a56 100644
--- a/process/WsValidation_lib/process.js
+++ b/process/WsValidation_lib/process.js
@@ -199,6 +199,11 @@ WsValidationUtils.validate = function(pValue, pType, pCountry)
var url = project.getPreferenceValue("custom." + pType.webserviceName + ".url");
var countryParamName = project.getPreferenceValue("custom." + pType.webserviceName + ".countryParamName");
+ if (!userName || !pw || !url || !countryParamName)
+ {
+ throw new Error("if the webservice " + pType.key + " is enabled, you have to provide also userName, pw, url and countryParamName")
+ }
+
var actionType = "GET";
if (pValue && pType)
@@ -277,12 +282,7 @@ WsValidationUtils.isWsEnabled = function(pType)
pType = WsValidationType.get(pType);
// get configurations for this type
- try
- {
- return JSON.parse(project.getPreferenceValue("custom." + pType.webserviceName + ".enable"));
- } catch (exception) {
- return false;
- }
+ return JSON.parse(project.getPreferenceValue("custom." + pType.webserviceName + ".enable", "false"));
}
/**
--
GitLab