diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod index 2d5c67c902415cce49a0ba2dcc9025e926f8bb04..254f12ad6aa35fc0c9e9878dee1a79b8e25520d4 100644 --- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod +++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod @@ -66,6 +66,7 @@ <title>Condition Type</title> <consumer>KeywordConditionType</consumer> <mandatory v="true" /> + <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js</displayValueProcess> </entityField> <entityField> <name>PARENT</name> diff --git a/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js b/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..b5c67bb76030695f7ec60962534bdfb3d4722d29 --- /dev/null +++ b/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js @@ -0,0 +1,18 @@ +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 diff --git a/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js b/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js index e2cc6a303bf6f4fa3ab2d6bbb71622e955687cef..0cbb9dc17b704cf7c50a05e2a678e3bb35984877 100644 --- a/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js +++ b/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js @@ -21,7 +21,7 @@ if (diff.length > 0) { var dbDeletes = db.deleteData(table, cond, alias); // insert the different actions - cols = db.getColumns(table); + cols = db.getColumns(table, alias); for each (var action in actionNew) { PermissionUtil.insertNewPermissionAction(permissionid, action); } diff --git a/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js index 3e7bd18d57ed6e83408d3197fbeda39780fc352c..244e9ef8dfb185d4cf55ef51872c621978d7c9e3 100644 --- a/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js +++ b/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js @@ -8,7 +8,9 @@ var res = []; if (selectedEntity == null) { 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 { for each (let entity in entities) {