#1048321 Berechtigungen greifen nicht bei Entity-Actions - fixed a bug where...

#1048321 Berechtigungen greifen nicht bei Entity-Actions - fixed a bug where creating permissions on entity actions was not possible

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

@@ -18,7 +18,7 @@ var permSetId = PermissionUtil.getSet(roleName, entity, accesstype, field);
 var fieldWhereCond = "ASYS_PERMISSIONSET.FIELD_ID is null";
 
 if (field != "") {
-    fieldWhereCond = newWhere("ASYS_PERMISSIONSET.FIELD_ID", field);
+    fieldWhereCond = "ASYS_PERMISSIONSET.FIELD_ID = '" + field + "'";
 }
 
 if (permSetId != "") {

process/Permission_lib/process.js

@@ -241,15 +241,20 @@ function PermissionUtil () {}
     * @result {String} returns id of default permission of given set. Never 'null', empty string if there is no result.
     */
     PermissionUtil.getPermissionWithoutCond = function(pSetId) {
-        var sqlStr = "select ENTITY_ID from ASYS_PERMISSIONSET where ASYS_PERMISSIONSETID = '" + pSetId + "'";
-        var entityName = db.cell(sqlStr, alias);
+        //var sqlStr = "select ENTITY_ID from ASYS_PERMISSIONSET where ASYS_PERMISSIONSETID = '" + pSetId + "'";
+        //var entityName = db.cell(sqlStr, alias);
+        //sqlStr and entityName got rewritten to sqlBuilder in entityName
+        var entityName = newSelect("ENTITY_ID", alias)
+            .from("ASYS_PERMISSIONSET")
+            .where("ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID", pSetId)
+            .cell();
         var emptyCond = PermissionUtil.getEmptyCondString(entityName);
         
-        sqlStr = "select ASYS_PERMISSIONID from ASYS_PERMISSION"
+        var sqlStr = "select ASYS_PERMISSIONID from ASYS_PERMISSION"
         + " where ASYS_PERMISSIONSET_ID = '" + pSetId + "'"
         + " and (COND is null"
         + " or " + sqlHelper.castLob("ASYS_PERMISSION.COND", 254) + " = '" + emptyCond + "')";
-        
+    
         return db.cell(sqlStr, alias);
     }
 
@@ -455,19 +460,25 @@ function PermissionUtil () {}
         "ASYS_PERMISSION_ID",
         "ACTION"
         ];
-        var actionId;
-        var sqlStr = "select ASYS_PERMISSIONACTIONID from ASYS_PERMISSIONACTION where ASYS_PERMISSIONACTIONID = '" + pActionId + "'";
-
-        if (pActionId != null & pActionId != "" && pActionId != undefined && db.cell(sqlStr, alias) == "") {
-            actionId = pActionId;
+        var newActionId;
+        //var sqlStr = "select ASYS_PERMISSIONACTIONID from ASYS_PERMISSIONACTION where ASYS_PERMISSIONACTIONID = '" + pActionId + "'";
+        //sqlStr got rewritten to sqlBuilder in actionIdInDb
+        var actionIdInDb = newSelect("ASYS_PERMISSIONACTION.ASYS_PERMISSIONACTIONID", alias)
+            .from("ASYS_PERMISSIONACTION")
+            .where("ASYS_PERMISSIONACTION.ASYS_PERMISSIONACTIONID", pActionId)
+            .cell();
+
+        if (pActionId != null & pActionId != "" && pActionId != undefined && actionIdInDb == "") {
+            newActionId = pActionId;
         } else {
-            actionId = util.getNewUUID(); // if same id is already in db -> create new UID
+            newActionId = util.getNewUUID(); // if same id is already in db -> create new UID
         }
-        var vals = [actionId, pParentPermId, pAction];
+        
+        var vals = [newActionId, pParentPermId, pAction];
         if (db.insertData(table, cols, null, vals, alias) == 0) {
             return null;
         }
-        return actionId;
+        return newActionId;
     }
     
     /**