test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-04 20:28:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Include for specific permissions config leads to bug in RoleEditor UI #PL-4840

Browse Source
This commit is contained in:
Yuriy Artamonov 2015-02-12 11:48:58 +00:00
parent 05e5060e78
commit 661c6b469d
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/gui/src/com/haulmont/cuba/gui/config/PermissionConfig.java
View File

@ -18,6 +18,7 @@ import com.haulmont.cuba.gui.security.entity.AttributeTarget;
import com.haulmont.cuba.gui.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.security.entity.MultiplePermissionTarget;
import com.haulmont.cuba.gui.security.entity.OperationPermissionTarget;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
@ -236,10 +237,24 @@ public class PermissionConfig {
String id = elem.attributeValue("id");
String caption = getMessage("permission-config." + id);
if ("category".equals(elem.getName())) {
Node<BasicPermissionTarget> n = new Node<>(
new BasicPermissionTarget("category:" + id, caption, null));
node.addChild(n);
walkSpecific(elem, n);
Node<BasicPermissionTarget> existingCategory = null;
String categoryPermissionId = "category:" + id;
for (Node<BasicPermissionTarget> subNode : node.getChildren()) {
if (categoryPermissionId.equals(subNode.getData().getId())) {
existingCategory = subNode;
break;
}
}
Node<BasicPermissionTarget> categoryNode;
if (existingCategory == null) {
categoryNode = new Node<>(new BasicPermissionTarget(categoryPermissionId, caption, null));
node.addChild(categoryNode);
} else {
categoryNode = existingCategory;
}
walkSpecific(elem, categoryNode);
} else if ("permission".equals(elem.getName())) {
Node<BasicPermissionTarget> n = new Node<>(
new BasicPermissionTarget("permission:" + id, caption, id));