Skip to content

Commit d1de1fb

Browse files
authored
Merge pull request #5607 from Countly/anna/master
Fixes for auto toggling data masking setting on redaction change in data manager
2 parents 34bed14 + f0f8bed commit d1de1fb

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

plugins/pluginManager.js

+12-6
Original file line numberDiff line numberDiff line change
@@ -2087,21 +2087,27 @@ var pluginManager = function pluginManager() {
20872087
return value;
20882088
}
20892089
else {
2090-
return !!myOb;
2090+
if (myOb === true) {
2091+
return true;
2092+
}
2093+
else {
2094+
return false;
2095+
}
20912096
}
20922097
}
20932098
this.isAnyMasked = function() {
2099+
var result = false;
20942100
if (masking && masking.apps) {
20952101
for (var app in masking.apps) {
20962102
if (masking.apps[app]) {
2097-
return hasAnyValueTrue(masking.apps[app].masking);
2103+
result = result || hasAnyValueTrue(masking.apps[app]);
2104+
if (result) {
2105+
return true;
2106+
}
20982107
}
20992108
}
2100-
return false;
2101-
}
2102-
else {
2103-
return false;
21042109
}
2110+
return result;
21052111
};
21062112

21072113
this.getMaskingSettings = function(appID) {

0 commit comments

Comments
 (0)