Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
basic
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
xrm
basic
Commits
6b7bb2a5
Commit
6b7bb2a5
authored
5 years ago
by
Johannes Hörmann
Browse files
Options
Downloads
Patches
Plain Diff
add default parameter for custom config loading where needed
parent
2e66130e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
process/DataCaching_lib/process.js
+3
-5
3 additions, 5 deletions
process/DataCaching_lib/process.js
process/WsValidation_lib/process.js
+6
-6
6 additions, 6 deletions
process/WsValidation_lib/process.js
with
9 additions
and
11 deletions
process/DataCaching_lib/process.js
+
3
−
5
View file @
6b7bb2a5
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
)
...
...
This diff is collapsed.
Click to expand it.
process/WsValidation_lib/process.js
+
6
−
6
View file @
6b7bb2a5
...
...
@@ -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
"
));
}
/**
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment