Skip to content
Snippets Groups Projects
Commit dbada8a6 authored by Simon Leipold's avatar Simon Leipold
Browse files

Permissions - using "usePermission"-flag now

parent 55a72379
No related branches found
No related tags found
No related merge requests found
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
<title>Condition Type</title> <title>Condition Type</title>
<consumer>KeywordConditionType</consumer> <consumer>KeywordConditionType</consumer>
<mandatory v="true" /> <mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js</displayValueProcess>
</entityField> </entityField>
<entityField> <entityField>
<name>PARENT</name> <name>PARENT</name>
......
import("system.logging");
import("system.vars");
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
var keywordContainer = "PermissionCondType";
var keywordEntrys = KeywordUtils.getEntryNamesByContainer(keywordContainer);
var condType = vars.get("$field.CONDTYPE");
switch (condType) {
case "true":
result.string(keywordEntrys[0]);
break;
case "false":
result.string(keywordEntrys[1]);
break;
}
\ No newline at end of file
...@@ -21,7 +21,7 @@ if (diff.length > 0) { ...@@ -21,7 +21,7 @@ if (diff.length > 0) {
var dbDeletes = db.deleteData(table, cond, alias); var dbDeletes = db.deleteData(table, cond, alias);
// insert the different actions // insert the different actions
cols = db.getColumns(table); cols = db.getColumns(table, alias);
for each (var action in actionNew) { for each (var action in actionNew) {
PermissionUtil.insertNewPermissionAction(permissionid, action); PermissionUtil.insertNewPermissionAction(permissionid, action);
} }
......
...@@ -8,7 +8,9 @@ var res = []; ...@@ -8,7 +8,9 @@ var res = [];
if (selectedEntity == null) { if (selectedEntity == null) {
for each (let entity in entities) { for each (let entity in entities) {
res.push([entity[0], entity[1], entity[2]]); if (entity[6] == "true") {
res.push([entity[0], entity[1], entity[2]]);
}
} }
} else { } else {
for each (let entity in entities) { for each (let entity in entities) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment