Permissions - bug fix: conditions of already existing permissions can be...

Permissions - bug fix: conditions of already existing permissions can be updated now without error message from onValidation process

entity/PermissionAction_entity/PermissionAction_entity.aod

@@ -48,6 +48,10 @@
       <name>AccessType_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityParameter>
+      <name>PermissionCondition_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>

entity/PermissionAction_entity/onValidation.js

+import("system.db");
 import("system.vars");
 import("system.translate");
 import("system.result");
 import("Permission_lib");
 
-var permissionId = vars.get("$param.PermissionId_param");
+var alias = "_____SYSTEMALIAS";
 var actionTitle = vars.get("$field.ACTION");
+var permissionId = vars.get("$param.PermissionId_param");
+var permCondInput = vars.get("$param.PermissionCondition_param");
 
 if (PermissionUtil.existsPermission(permissionId)) {
     // existing permission
     // check if action is already in DB
     var actionsInDb = PermissionUtil.getPermissionAction(permissionId);
+    var sqlStr = "select COND from ASYS_PERMISSION where ASYS_PERMISSIONID='" + permissionId + "'";
+    var permCondDb = db.cell(sqlStr, alias);
+    
     for each (var action in actionsInDb) {
-        if (PermissionUtil.resolvePermissionActionId(action) == actionTitle) {
+        if (PermissionUtil.resolvePermissionActionId(action) == actionTitle && permCondInput == permCondDb) {
             result.string(translate.text("Action '" + actionTitle + "' already linked to this permission!"));
             break;
         }

entity/PermissionDetail_entity/PermissionDetail_entity.aod

@@ -188,6 +188,10 @@
           <name>AccessType_param</name>
           <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/permissionactions/children/accesstype_param/valueProcess.js</valueProcess>
         </entityParameter>
+        <entityParameter>
+          <name>PermissionCondition_param</name>
+          <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/permissionactions/children/permissioncondition_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
     </entityConsumer>
   </entityFields>

entity/PermissionDetail_entity/entityfields/permissionactions/children/permissioncondition_param/valueProcess.js

+import("system.vars");
+import("system.result");
+result.string(vars.get("$field.CONDITION"));
\ No newline at end of file