Fix for word generator not merging multiple visibility rule results
This commit is contained in:
parent
e9b0bcf102
commit
2b71cddc39
|
@ -43,8 +43,12 @@ public class VisibilityRuleServiceImpl implements VisibilityRuleService {
|
||||||
for(int i = 0; i < sources.size(); i++){
|
for(int i = 0; i < sources.size(); i++){
|
||||||
if (properties.containsKey(sources.get(i).getVisibilityRuleSourceId()) && (isContained(properties.get(sources.get(i).getVisibilityRuleSourceId()), sources.get(i).getVisibilityRuleSourceValue()) || properties.get(sources.get(i).getVisibilityRuleSourceId()).equals(sources.get(i).getVisibilityRuleSourceValue()))) {
|
if (properties.containsKey(sources.get(i).getVisibilityRuleSourceId()) && (isContained(properties.get(sources.get(i).getVisibilityRuleSourceId()), sources.get(i).getVisibilityRuleSourceValue()) || properties.get(sources.get(i).getVisibilityRuleSourceId()).equals(sources.get(i).getVisibilityRuleSourceValue()))) {
|
||||||
this.elementVisibility.put(rule.getVisibilityRuleTargetId(), true);
|
this.elementVisibility.put(rule.getVisibilityRuleTargetId(), true);
|
||||||
|
}else{
|
||||||
|
if (this.elementVisibility.containsKey(rule.getVisibilityRuleTargetId())) {
|
||||||
|
this.elementVisibility.put(rule.getVisibilityRuleTargetId(), this.elementVisibility.get(rule.getVisibilityRuleTargetId()) || false);
|
||||||
} else {
|
} else {
|
||||||
this.elementVisibility.put(rule.getVisibilityRuleTargetId(), false);
|
this.elementVisibility.put(rule.getVisibilityRuleTargetId(), false);
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue