Skip to content

Commit

Permalink
policy rule name fix (MID-4647)
Browse files Browse the repository at this point in the history
  • Loading branch information
KaterynaHonchar committed May 14, 2018
1 parent d40ee8d commit 1672e97
Showing 1 changed file with 15 additions and 1 deletion.
Expand Up @@ -10,6 +10,7 @@
import com.evolveum.midpoint.util.QNameUtil;
import com.evolveum.midpoint.web.component.prism.ContainerValueWrapper;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
Expand Down Expand Up @@ -224,7 +225,20 @@ public static String getName(AssignmentType assignment, PageBase pageBase) {

if (assignment.getPolicyRule() != null){
PolicyRuleType policyRuleContainer = assignment.getPolicyRule();
return policyRuleContainer.getName();
if (StringUtils.isNotEmpty(policyRuleContainer.getName())){
return policyRuleContainer.getName();
} else {
StringBuilder sb = new StringBuilder("");
PolicyConstraintsType constraints = policyRuleContainer.getPolicyConstraints();
if (constraints != null && constraints.getExclusion() != null && constraints.getExclusion().size() > 0){
sb.append(pageBase.createStringResource("PolicyConstraintsType.exclusion").getString() + ": ");
constraints.getExclusion().forEach(exclusion -> {
sb.append(WebComponentUtil.getName(exclusion.getTargetRef()));
sb.append("; ");
});
}
return sb.toString();
}

}
StringBuilder sb = new StringBuilder();
Expand Down

0 comments on commit 1672e97

Please sign in to comment.