Skip to content
Snippets Groups Projects
Commit 80d96b52 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

Do not rely on the column order from db.getColumns

parent 0c715741
No related branches found
No related tags found
No related merge requests found
......@@ -6,7 +6,7 @@ import("system.db");
import("system.vars");
import("Permission_lib");
var table, cols, vals, cond;
var table, vals, cond;
var alias = SqlUtils.getSystemAlias();
var permissionid = vars.get("$field.UID");
......@@ -23,7 +23,6 @@ if (diff.length > 0) {
var dbDeletes = db.deleteData(table, cond, alias);
// insert the different actions
cols = db.getColumns(table, alias);
for each (var action in actionNew) {
PermissionUtil.insertAction(permissionid, action);
}
......
......@@ -391,7 +391,14 @@ function PermissionUtil () {}
*/
PermissionUtil.insertSet = function(pParentPermSetId, pEntity, pRole, pField, pAccessType) {
var table = "ASYS_PERMISSIONSET";
var cols = db.getColumns(table, alias);
var cols = [
"FIELD_ID",
"ACCESSTYPE",
"ROLE_ID",
"ASYS_PERMISSIONSETID",
"ASYS_PERMISSIONSET_ID",
"ENTITY_ID"
];
var setId = util.getNewUUID();
var vals = [pField, pAccessType, pRole, setId, pParentPermSetId, pEntity];
db.insertData(table, cols, null, vals, alias);
......@@ -413,7 +420,12 @@ function PermissionUtil () {}
*/
PermissionUtil.insertPermission = function(pParentSetId, pCond, pCondType, pPermId) {
var table = "ASYS_PERMISSION";
var cols = db.getColumns(table, alias);
var cols = [
"ASYS_PERMISSIONSET_ID",
"ASYS_PERMISSION",
"CONDTYPE",
"COND"
];
var permId;
if (pPermId != null && pPermId != "" && pPermId != undefined) {
permId = pPermId;
......@@ -438,7 +450,11 @@ function PermissionUtil () {}
*/
PermissionUtil.insertAction = function(pParentPermId, pAction, pActionId) {
var table = "ASYS_PERMISSIONACTION";
var cols = db.getColumns(table, alias);
var cols = [
"ASYS_PERMISSIONACTIONID",
"ASYS_PERMISSION_ID",
"ACTION"
];
var actionId;
var sqlStr = "select ASYS_PERMISSIONACTIONID from ASYS_PERMISSIONACTION where ASYS_PERMISSIONACTIONID = '" + pActionId + "'";
......
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