diff --git a/entity/Address_entity/recordcontainers/db/conditionProcess.js b/entity/Address_entity/recordcontainers/db/conditionProcess.js
index c4efac40ae8a5341a729f2731f5dbf1c2ab995f5..a938934f9b9642e9935641e62b1a9f8d957e1fbc 100644
--- a/entity/Address_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Address_entity/recordcontainers/db/conditionProcess.js
@@ -3,9 +3,14 @@ import("system.vars");
import("system.db");
import("Sql_lib");
-var cond = newWhereIfSet("ADDRESS.CONTACT_ID", "$param.ContactId_param");
+var cond = newWhere()
+
+if (vars.exists("$param.ContactId_param")) // Todo: shouldn't be needed, but sometimes in the filter view of pers / org the param doesn't exist?? --> It should be null if it's not set...
+ cond.andIfSet("ADDRESS.CONTACT_ID", "$param.ContactId_param");
+
+if (vars.exists("$param.OrganisationId_param")) // Todo: shouldn't be needed, but sometimes in the filter view of pers / org the param doesn't exist??' --> It should be null if it's not set...
+ var organisationId = vars.get("$param.OrganisationId_param");
-var organisationId = vars.get("$param.OrganisationId_param");
if (organisationId)
{
var organisationContactId = newSelect("CONTACT.CONTACTID")
diff --git a/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js b/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
index 65023ac01660847511633352c0b28e9228d7ee66..67f3a29c537f716f715291f86030ac7bf728e6f1 100644
--- a/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
+++ b/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
@@ -6,7 +6,7 @@ import("system.vars");
// --> only set in $field.Content.valueProcess if $field.Content is null and set it from here only if MASK triggered change
if((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW))
{
- [content, type] = DocumentTemplateUtils.getTemplateContent(vars.get("$field.DOCUMENTTEMPLATEID"), new FileUpload(vars.get("$local.value")));
+ var [content, type] = DocumentTemplateUtils.getTemplateContent(vars.get("$field.DOCUMENTTEMPLATEID"), new FileUpload(vars.get("$local.value")));
vars.set("$context.currentTemplateType", type);
vars.set("$field.Content", content)
diff --git a/entity/DocumentTemplate_entity/entityfields/content/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/content/valueProcess.js
index 5158388e7c2042154859ba89649d91e398eb12da..fbecd887105302ba21c9e5b44e764daeb1c11d65 100644
--- a/entity/DocumentTemplate_entity/entityfields/content/valueProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/content/valueProcess.js
@@ -6,7 +6,7 @@ import("system.vars");
if((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW) && vars.get("$this.value") == null)
{
- [content, type] = DocumentTemplateUtils.getTemplateContent(vars.get("$field.DOCUMENTTEMPLATEID"), new FileUpload(vars.get("$field.BINDATA")));
+ var [content, type] = DocumentTemplateUtils.getTemplateContent(vars.get("$field.DOCUMENTTEMPLATEID"), new FileUpload(vars.get("$field.BINDATA")));
vars.set("$context.currentTemplateType", type);
result.string(content);
}
diff --git a/entity/DuplicateScannerIndexConfig_entity/entityfields/entity_field_name/dropDownProcess.js b/entity/DuplicateScannerIndexConfig_entity/entityfields/entity_field_name/dropDownProcess.js
index d4796d833a5d5c213fdb3282b2bac83ede763c6d..50a80994966abea65093e0451058fdd68510e9d7 100644
--- a/entity/DuplicateScannerIndexConfig_entity/entityfields/entity_field_name/dropDownProcess.js
+++ b/entity/DuplicateScannerIndexConfig_entity/entityfields/entity_field_name/dropDownProcess.js
@@ -8,7 +8,7 @@ var model = project.getEntityStructure(currentEntity);
let entityFields = [];
for (fieldname in model.fields)
{
- field = model.fields[fieldname];
+ let field = model.fields[fieldname];
if(field.fieldType == project.ENTITYFIELDTYPE_FIELD)
{
entityFields.push([field.name, currentEntity + "." + field.name]);
diff --git a/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js b/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
index 3a533bb36dc76380d281f23cbbb8bd06977f7e42..21e881f3538fbf8173275dafb2b9a2a437e7a038 100644
--- a/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
@@ -61,8 +61,7 @@ function _groupData(pData)
return [];
var res = [];
- var logDatetime, logUser, logDesc;
- [logDatetime, logUser, logDesc] = pData[0];
+ var [logDatetime, logUser, logDesc] = pData[0];
var previousGroupingIdentifier = _makeGroupingIdentifier(logDatetime, logUser);
var logUid = previousGroupingIdentifier;//maybe add more information? But for not thats okay
@@ -77,7 +76,7 @@ function _groupData(pData)
{
res.push([logUid, logDatetime, logUser, logDesc]);
[logDatetime, logUser, logDesc] = pData[i];
- previousGroupingIdentifier = _makeGroupingIdentifier(logDatetime, logUser);
+ previousGroupingIdentifier = _makeGroupingIdentifier(, logUser);
logUid = previousGroupingIdentifier;
}
}
diff --git a/entity/PermissionDetail_entity/entityfields/field/stateProcess.js b/entity/PermissionDetail_entity/entityfields/field/stateProcess.js
index a28f5c86f9be5e45e9d693571091ce4a7fd1d03a..d32cd4fbebf1eb7d206da2179868048a2eb4951b 100644
--- a/entity/PermissionDetail_entity/entityfields/field/stateProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/field/stateProcess.js
@@ -14,7 +14,7 @@ if (rootPermSet == "") {
} else {
entityStructure = project.getEntityStructure(entity);
for (fieldname in entityStructure.fields) {
- field = entityStructure.fields[fieldname];
+ var field = entityStructure.fields[fieldname];
if (field.usePermissions == true) {
result.string(neon.COMPONENTSTATE_EDITABLE)
}
diff --git a/entity/PermissionDetail_entity/entityfields/permissionactions/children/permissionid_param/valueProcess.js b/entity/PermissionDetail_entity/entityfields/permissionactions/children/permissionid_param/valueProcess.js
index 0348c341db644ef51ec87d5a056f3c3c499f6982..17eccf6fb293fb7cfc0bd1ee58b86616127392ce 100644
--- a/entity/PermissionDetail_entity/entityfields/permissionactions/children/permissionid_param/valueProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/permissionactions/children/permissionid_param/valueProcess.js
@@ -23,6 +23,7 @@ if (permSetId != "") {
var sqlHelper = new SqlMaskingUtils(alias);
+ // Why a loop which breaks instantly??
for each (let perm in permsWithCond) {
rootPermId = newSelect("ASYS_PERMISSIONID", alias)
.from("ASYS_PERMISSION")
@@ -30,12 +31,6 @@ if (permSetId != "") {
.where("ASYS_PERMISSION.COND", cond, sqlHelper.cast("#", SQLTYPES.VARCHAR, cond.length) + " = ?")
.and("ASYS_PERMISSIONSET.FIELD_ID", field)
.cell();
-
- logging.log(JSON.stringify([newSelect("ASYS_PERMISSIONID", alias)
- .from("ASYS_PERMISSION")
- .join("ASYS_PERMISSIONSET", "ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID = ASYS_PERMISSION.ASYS_PERMISSIONSET_ID")
- .where("ASYS_PERMISSION.COND", cond, sqlHelper.cast("#", SQLTYPES.VARCHAR, cond.length) + " = ?")
- .and("ASYS_PERMISSIONSET.FIELD_ID", field).toString()], null, "\t"))
break;
}
}
diff --git a/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
index c6bf07a7d71bd034a2df97aa6099924bc3fe9aef..d47bb91dfd65bde6189c530fb4d25e7de0597e33 100644
--- a/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
@@ -6,6 +6,7 @@ import("system.result");
import("Permission_lib");
import("system.project");
+var alias = SqlUtils.getSystemAlias();
var selectedPermission = vars.get("$local.idvalues");
var sqlStr;
var querySelect = newSelect("ASYS_PERMISSION.ASYS_PERMISSIONID, ASYS_PERMISSIONSET.ENTITY_ID, ASYS_PERMISSIONSET.ROLE_ID,"
@@ -15,7 +16,6 @@ var querySelect = newSelect("ASYS_PERMISSION.ASYS_PERMISSIONID, ASYS_PERMISSIONS
.join("ASYS_PERMISSIONACTION", "ASYS_PERMISSIONACTION.ASYS_PERMISSION_ID = ASYS_PERMISSION.ASYS_PERMISSIONID")
.orderBy("ASYS_PERMISSION.ASYS_PERMISSIONID")
-var alias = SqlUtils.getSystemAlias();
var entitiesMetaData = project.getDataModels(project.DATAMODEL_KIND_ENTITY);
var entityStructure;
var entitiesUsePermFlagSet = [];
@@ -38,14 +38,18 @@ for each (let entityMetaData in entitiesMetaData) {
}
var sqlRes = [];
-
+if (vars.get("$local.idvalues") && vars.get("$local.idvalues").length > 0)
+{
+ sqlRes = querySelect.where("ASYS_PERMISSION.ASYS_PERMISSIONID", vars.get("$local.idvalues"))
+ .table();
+}
// load nothing if no entity uses permissions
-if (entitiesUsePermFlagSet.length > 0)
+else if (entitiesUsePermFlagSet.length > 0)
{
querySelect.where("ASYS_PERMISSIONSET.ENTITY_ID", entitiesUsePermFlagSet, SqlBuilder.IN());
// if fieldsUsePermFlagSet is empty it checks only for "is null" (that's why newWhereIfSet and not newWhere)
- querySelect.and(newWhereIfSet("ASYS_PERMISSIONSET.FIELD_ID", fieldsUsePermFlagSet, SqlBuilder.IN())
+ querySelect.and(newWhereIfSet("ASYS_PERMISSIONSET.FIELD_ID", fieldsUsePermFlagSet, SqlBuilder.IN(), undefined, alias)
.or("FIELD_ID is NULL"));
if (vars.get("$param.RoleTitle_param")) {
diff --git a/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js b/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js
index a527405ae5687963a6042818c137b72d0d442b0f..0a6bc9e065076c1f6f04508a7a9dfc2b499c8828 100644
--- a/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("Sql_lib");
import("Permission_lib");
import("system.neon");
@@ -20,10 +21,10 @@ var condtype = vars.get("$field.CONDTYPE").trim();
var condition = vars.get("$field.CONDITION");
if (checkInput([role, entity, accesstype, condtype])) {
-
+
// permission set
var permissionsetid = PermissionUtil.getSet(role, entity, accesstype, field);
-
+
if (permissionsetid == "") {
// no fitting permissionset found - insert new permissionset
var rootpermissionset;
diff --git a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
index c9659992f7227dc9bbbfb4cea5479bdf88ac56b5..84f4b2e49feaad52274092837a33e37cb592d82e 100644
--- a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
@@ -27,7 +27,7 @@ for each (let entityMetaData in entitiesMetaData) {
}
}
-var rolesOrEntitiesSelect = new SqlBuilder(alias);
+var rolesOrEntitiesSelect = new SqlBuilder(alias).where();
var rolesOrEntities = [];
// select nothing if no entities have the perm flag set
if (entitiesUsePermFlagSet.length > 0)
@@ -36,14 +36,14 @@ if (entitiesUsePermFlagSet.length > 0)
roleTitle = vars.getString("$param.RoleTitle_param");
rolesOrEntitiesSelect.select("distinct ENTITY_ID")
.from("ASYS_PERMISSIONSET")
- .where("ASYS_PERMISSIONSET.ROLE_ID", roleTitle)
+ .and("ASYS_PERMISSIONSET.ROLE_ID", roleTitle)
}
else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param"))
{
entityTitle = vars.getString("$param.EntityTitle_param");
rolesOrEntitiesSelect.select("distinct ROLE_ID")
.from("ASYS_PERMISSIONSET")
- .where("ASYS_PERMISSIONSET.ENTITY_ID", entityTitle)
+ .and("ASYS_PERMISSIONSET.ENTITY_ID", entityTitle)
}
rolesOrEntities = rolesOrEntitiesSelect
@@ -117,9 +117,11 @@ function prepareOverview(pPermSetId, pCurrOverview, pMode) {
break;
case "conditional":
var permIds = PermissionUtil.getPermissionWithCond(pPermSetId);
- for each (let permId in permIds) {
+
+ permIds.forEach(function(permId) {
conditionalPermActionId.push(PermissionUtil.getActions([permId]));
- }
+ });
+
currOverview = pCurrOverview;
for each (let actionSets in conditionalPermActionId) {
diff --git a/entity/Person_entity/recordcontainers/db/onDBInsert.js b/entity/Person_entity/recordcontainers/db/onDBInsert.js
index 5f069680c3cd50ac7a7b062d6a9c55a22a176dcc..60c78c1ebd2d44dd31bad36d14d429790a79bdd2 100644
--- a/entity/Person_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Person_entity/recordcontainers/db/onDBInsert.js
@@ -23,7 +23,7 @@ let fieldValue = "";
let entityFields = [];
for (fieldname in entityModel.fields)
{
- field = entityModel.fields[fieldname];
+ var field = entityModel.fields[fieldname];
if(field.fieldType == project.ENTITYFIELDTYPE_FIELD)
{
fieldValue = vars.get("$field." + field.name);
diff --git a/entity/Prod2prod_entity/onDelete.js b/entity/Prod2prod_entity/onDelete.js
index db58c1cefaa25343e74adc63beaf54214f7389e3..ab2c10fb558736441e8e83a6777c37049726d4fb 100644
--- a/entity/Prod2prod_entity/onDelete.js
+++ b/entity/Prod2prod_entity/onDelete.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.db");
+import("Sql_lib");
-db.deleteData("PROD2PROD", "PROD2PRODID = '" + vars.get("$field.UID") + "'");
\ No newline at end of file
+newWhere("PROD2PROD.PROD2PRODID", "$field.UID")
+ .deleteData(true, "PROD2PROD");
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/onUpdate.js b/entity/Prod2prod_entity/onUpdate.js
index 55e282082f1857e64dc6048897e904b4905a1d81..a2834dd3ef42b887903d8b4de5ed989f4f2fa16d 100644
--- a/entity/Prod2prod_entity/onUpdate.js
+++ b/entity/Prod2prod_entity/onUpdate.js
@@ -1,6 +1,5 @@
-import("system.datetime");
+import("Sql_lib");
import("system.vars");
-import("system.db");
var cols = [ "DEST_ID"
, "SOURCE_ID"
@@ -14,6 +13,5 @@ var vals = [ vars.get("$field.DEST_ID")
, vars.get("$field.OPTIONAL")
, vars.get("$field.TAKEPRICE") ];
-var colTypes = db.getColumnTypes("PROD2PROD", cols);
-
-db.updateData("PROD2PROD", cols, colTypes, vals, "PROD2PRODID = '" + vars.get("$field.UID") + "'");
\ No newline at end of file
+newWhere("PROD2PROD.PROD2PRODID", "$field.UID")
+ .updateData(true, "PROD2PROD", cols, null, vals);
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/recordcontainers/jdito/onUpdate.js b/entity/Prod2prod_entity/recordcontainers/jdito/onUpdate.js
index 0dff9d0fdd1ee895b0c9a497806550dfa376e6c8..c71a9c41db27fb3478fde565b44b9c5b7643c1c3 100644
--- a/entity/Prod2prod_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Prod2prod_entity/recordcontainers/jdito/onUpdate.js
@@ -1,6 +1,6 @@
+import("Sql_lib");
import("system.datetime");
import("system.vars");
-import("system.db");
var cols = [ "SOURCE_ID"
, "QUANTITY"
@@ -12,4 +12,5 @@ var vals = [ vars.get("$field.SOURCE_ID")
, vars.get("$field.OPTIONAL")
, vars.get("$field.TAKEPRICE") ];
-db.updateData("PROD2PROD", cols, null, vals, "PROD2PRODID = '" + vars.get("$field.PROD2PRODID") + "'");
\ No newline at end of file
+newWhere("PROD2PROD.PROD2PRODID", "$field.PROD2PRODID")
+ .updateData(true, "PROD2PROD", cols, null, vals);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index 8907222fcda32f16e8cf7b141b1c4f9e03bfa7c6..13bc554239d5d61b4cc8742f07dbac112c1e5dd7 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -8,7 +8,6 @@
<afterUiInit>%aditoprj%/entity/SupportTicket_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/SupportTicket_entity/onValidation.js</onValidation>
<iconId>VAADIN:CHAT</iconId>
- <usePermissions v="true" />
<titlePlural>Support Tickets</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
diff --git a/process/ActivityTask_lib/process.js b/process/ActivityTask_lib/process.js
index 03479693220e9baa036176867baba53f2580b487..443b3194147011e93c5fa9db48a20cbed0531f27 100644
--- a/process/ActivityTask_lib/process.js
+++ b/process/ActivityTask_lib/process.js
@@ -125,8 +125,7 @@ ActivityUtils.insertDocuments = function (pActivityId, pDocuments)
{
pDocuments.forEach(function (document)
{
- var filename, b64Content, isMainDocument;
- [filename, b64Content, isMainDocument] = document;
+ var [filename, b64Content, isMainDocument] = document;
if (isMainDocument)
SingleBinaryUtils.insertMainDocument("ACTIVITY", "DOCUMENT", pActivityId, b64Content, filename);
else
diff --git a/process/IncomingEmailExecutor_lib/process.js b/process/IncomingEmailExecutor_lib/process.js
index 27532e621d43c937fa28fa4d1c9bea88f8b8361c..374296409d465f9df4fa95274d9f724a6d5d3b9f 100644
--- a/process/IncomingEmailExecutor_lib/process.js
+++ b/process/IncomingEmailExecutor_lib/process.js
@@ -229,8 +229,7 @@ IncomingEmailExecutor.prototype.autoProcess = function(pUnlinkedMailId)
IncomingEmailExecutor.prototype._getProcessingFunction = function (pIsSender, pTargetArray)
{
return function(contactInfoRow) {
- var contactId, contactStatus, contactPersonId, languageIso3;
- [contactId, contactStatus, contactPersonId, languageIso3] = contactInfoRow;
+ var [contactId, contactStatus, contactPersonId, languageIso3] = contactInfoRow;
//there *should* only exist no or one user per contactid, never two or more - so getUser (not getUsers) should be fine
var user = tools.getUserByAttribute(tools.CONTACTID, [contactId]);
diff --git a/process/Permission_lib/process.js b/process/Permission_lib/process.js
index cf725e6f01011373a500fcda94a65e212b42c1fa..930bd8b3ad18f7e6bc02f1fd9e44e552fda9030e 100644
--- a/process/Permission_lib/process.js
+++ b/process/Permission_lib/process.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.SQLTYPES");
import("system.util");
import("system.db");
@@ -40,7 +39,7 @@ function PermissionUtil () {}
{
return newSelect("ASYS_PERMISSIONSETID", alias)
.from("ASYS_PERMISSIONSET")
- .whereIfSet("ASYS_PERMISSIONSET_ID", pSetId)
+ .whereIfSet("ASYS_PERMISSIONSET.ASYS_PERMISSIONSET_ID", pSetId)
.arrayColumn(true);
}
@@ -70,11 +69,11 @@ function PermissionUtil () {}
PermissionUtil.getActions = function(pPermIds) {
if (pPermIds.length <= 0)
return [];
-
+
return newSelect("ASYS_PERMISSIONACTIONID", alias)
.from("ASYS_PERMISSIONACTION")
.whereIfSet("ASYS_PERMISSIONACTION.ASYS_PERMISSION_ID", pPermIds, SqlBuilder.IN())
- .table(true);
+ .arrayColumn(true);
}
/**
@@ -145,7 +144,7 @@ function PermissionUtil () {}
PermissionUtil.getActionDiff = function(pPermId, pActionNew) {
var actionOld = newSelect("ACTION", alias)
.from("ASYS_PERMISSIONACTION")
- .whereIfSet("ASYS_PERMISSION_ID", pPermId)
+ .whereIfSet("ASYS_PERMISSIONACTION.ASYS_PERMISSION_ID", pPermId)
.arrayColumn(true);
return arrDiff(actionOld, pActionNew);
@@ -167,7 +166,7 @@ function PermissionUtil () {}
PermissionUtil.isDiff = function(pId, pString, pDbCol, pDbTable) {
var stringDb = newSelect(pDbCol, alias)
.from(pDbTable)
- .whereIfSet(pDbTable + "ID", pId)
+ .whereIfSet([pDbTable, pDbTable + "ID"], pId)
.cell(true);
return stringDb != pString ? true : false;
}
@@ -190,7 +189,7 @@ function PermissionUtil () {}
var cols = [pDbCol];
var vals = [pValue];
- var cond = new SqlBuilder(alias).whereIfSet(pDbTable + "ID", pId);
+ var cond = new SqlBuilder(alias).whereIfSet([pDbTable, pDbTable + "ID"], pId);
return cond.updateData(true, pDbTable, cols, null, vals)
}
@@ -198,27 +197,25 @@ function PermissionUtil () {}
}
/**
- * Gets the number of permissions which are linked to the given entity-role-combination.
- * It is possible to set one parameter to null to get the number of permissions of a role or entity.
- * Both parameter null gets the number of all permissions in the system.
- *
- * @param {String} pEntityName name of the entity, can be null
- *
- * @param {String} pRole name of the role, can be null
- *
- * @result {Integer} returns number of permissions linked to the entity-role-combination.
- */
+ * Gets the number of permissions which are linked to the given entity-role-combination.
+ * It is possible to set one parameter to null/undefined to get the number of permissions of a role or entity.
+ * Both parameter null/undefined gets the number of all permissions in the system.
+ *
+ * @param {String} [pEntityName] name of the entity, can be null
+ *
+ * @param {String} [pRole] name of the role, can be null
+ *
+ * @result {Integer} returns number of permissions linked to the entity-role-combination.
+ */
PermissionUtil.getNumberOfPermissions = function(pEntityName, pRole) {
return newSelect("COUNT(*)", alias)
.from("ASYS_PERMISSIONSET")
- .whereIfSet("ENTITY_ID", pEntityName)
- .andIfSet("ROLE_ID", pRole)
+ .whereIfSet("ASYS_PERMISSIONSET.ENTITY_ID", pEntityName)
+ .andIfSet("ASYS_PERMISSIONSET.ROLE_ID", pRole)
.cell(true, "0");
}
-// TODO: use SqlBuilder in whole lib (why? --> Prepared statements should be used always)
-
- /**
+/**
* Gets the default permission of the root permission set.
*
* @param {String} pPermId id of the permission
@@ -229,122 +226,149 @@ function PermissionUtil () {}
var parentSet = [PermissionUtil.getParentSet(pPermId)];
while (parentSet[0] != "") {
- let sqlStr = "select ASYS_PERMISSIONSET_ID, ASYS_PERMISSIONSETID from ASYS_PERMISSIONSET where ASYS_PERMISSIONSETID = '" + parentSet[0] + "'";
- parentSet = db.array(db.ROW, sqlStr, alias);
+ parentSet = newSelect("ASYS_PERMISSIONSET_ID, ASYS_PERMISSIONSETID", alias)
+ .from("ASYS_PERMISSIONSET")
+ .where("ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID", parentSet[0])
+ .arrayRow();
}
return PermissionUtil.getPermissionWithoutCond(parentSet[1]);
}
/**
- * Gets the default permission of a given permission set.
- *
- * @param {String} pSetId id of the permission set
- *
- * @result {String} returns id of default permission of given set. Never 'null', empty string if there is no result.
- */
+ * get the entity for a specific permissionset.
+ *
+ * @param {String} pSetId the id of the permission set
+ *
+ * @return {String} the entity name or an empty string if not found
+ */
+ PermissionUtil._getEntity = function(pSetId) {
+ return newSelect("ENTITY_ID", alias)
+ .from("ASYS_PERMISSIONSET")
+ .whereIfSet("ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID", pSetId)
+ .cell(true, "");
+ }
+
+ /**
+ * Gets the default permission of a given permission set.
+ *
+ * @param {String} pSetId id of the permission set
+ *
+ * @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 emptyCond = PermissionUtil.getEmptyCondString(entityName);
-
- 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);
+ var emptyCond = PermissionUtil.getEmptyCondString(PermissionUtil._getEntity(pSetId));
+
+ return newSelect("ASYS_PERMISSIONID", alias)
+ .from("ASYS_PERMISSION")
+ .whereIfSet("ASYS_PERMISSION.ASYS_PERMISSIONSET_ID", pSetId)
+ .and(new SqlBuilder(alias).where()
+ .or("COND is null")
+ .or("ASYS_PERMISSION.COND", emptyCond, sqlHelper.castLob("#", 254) +" = ?")
+ )
+ .cell();
}
/**
- * Gets the permissions with conditions of a given permission set.
- *
- * @param {String} pSetId the id of the permission set
- *
- * @result {String[]} returns the ids of permissions with conditions of a given permission set. The result can never be null.
- */
+ * Gets the permissions with conditions of a given permission set.
+ *
+ * @param {String} pSetId the id of the permission set
+ *
+ * @result {String[]} returns the ids of permissions with conditions of a given permission set. The result can never be null.
+ */
PermissionUtil.getPermissionWithCond = function(pSetId) {
- var sqlStr = "select ENTITY_ID from ASYS_PERMISSIONSET where ASYS_PERMISSIONSETID = '" + pSetId + "'";
- var entityName = db.cell(sqlStr, alias);
- var emptyCond = PermissionUtil.getEmptyCondString(entityName);
+ var emptyCond = PermissionUtil.getEmptyCondString(PermissionUtil._getEntity(pSetId));
- sqlStr = "select ASYS_PERMISSIONID from ASYS_PERMISSION"
- + " where ASYS_PERMISSIONSET_ID = '" + pSetId + "'"
- + " and COND is not null"
- + " and " + sqlHelper.castLob("ASYS_PERMISSION.COND", 254) + " != '" + emptyCond + "'";
- return db.table(sqlStr, alias);
+ return newSelect("ASYS_PERMISSIONID", alias)
+ .from("ASYS_PERMISSION")
+ .whereIfSet("ASYS_PERMISSION.ASYS_PERMISSIONSET_ID", pSetId)
+ .and(new SqlBuilder(alias).where()
+ .or("COND is not null")
+ .or("ASYS_PERMISSION.COND", emptyCond, sqlHelper.castLob("#", 254) +" != ?")
+ )
+ .arrayColumn();
}
/**
- * Gets the permission set id of a given role-entity-accesstype-combination.
- *
- * @param {String} pRole name of the role
- *
- * @param {String} pEntity name of the entity
- *
- * @param {String} pAccessType name of the access type (E,R,F)
- *
- * @param {String} pField name of the field
- *
- * @result {String} returns id of the matching permission set. The result can never be null.
- */
+ * Gets the permission set id of a given role-entity-accesstype-combination.
+ *
+ * @param {String} pRole name of the role
+ *
+ * @param {String} pEntity name of the entity
+ *
+ * @param {String} pAccessType name of the access type (E,R,F)
+ *
+ * @param {String} [pField] name of the field
+ *
+ * @result {String} returns id of the matching permission set. The result can never be null.
+ */
PermissionUtil.getSet = function(pRole, pEntity, pAccessType, pField) {
- var sqlStr = "select ASYS_PERMISSIONSETID from ASYS_PERMISSIONSET"
- + " where ROLE_ID = '" + pRole + "' and ENTITY_ID = '" + pEntity + "' and ACCESSTYPE = '" + pAccessType + "'";
- if (pField != null && pField != "" && pField != undefined) {
- sqlStr += " and FIELD_ID = '" + pField + "'";
+
+ var query = newSelect("ASYS_PERMISSIONSETID", alias)
+ .from("ASYS_PERMISSIONSET")
+ .where("ASYS_PERMISSIONSET.ROLE_ID", pRole)
+ .and("ASYS_PERMISSIONSET.ENTITY_ID", pEntity)
+ .and("ASYS_PERMISSIONSET.ACCESSTYPE", pAccessType);
+
+ if (pField) {
+ query.and("ASYS_PERMISSIONSET.FIELD_ID", pField)
}
- return db.cell(sqlStr, alias);
+ return query.cell();
}
/**
- * Gets the root permission set of a entity-role-combination.
- *
- * @param {String} pRole id of a role
- *
- * @param {String} pEntity id of an entity
- *
- * @result {String} returns id of the root permission set of the given entity-role-combination. Never 'null', empty string if there is no result.
- */
+ * Gets the root permission set of a entity-role-combination.
+ *
+ * @param {String} pRole id of a role
+ *
+ * @param {String} pEntity id of an entity
+ *
+ * @result {String} returns id of the root permission set of the given entity-role-combination. Never 'null', empty string if there is no result.
+ */
PermissionUtil.getSetRoot = function(pRole, pEntity) {
- var sqlStr = "select ASYS_PERMISSIONSETID from ASYS_PERMISSIONSET"
- + " where ROLE_ID = '" + pRole + "' and ENTITY_ID = '" + pEntity +"' and ACCESSTYPE = 'E'";
- return db.cell(sqlStr, alias);
+ return newSelect("ASYS_PERMISSIONSETID", alias)
+ .from("ASYS_PERMISSIONSET")
+ .where("ASYS_PERMISSIONSET.ROLE_ID", pRole)
+ .and("ASYS_PERMISSIONSET.ENTITY_ID", pEntity)
+ .and("ASYS_PERMISSIONSET.ACCESSTYPE", "E")
+ .cell();
}
/**
- * Gets the parent permission set of a permission.
- *
- * @param {String} pPermId id of the permission
- *
- * @result {String} returns id of the parent set of the given permission. Never 'null', empty string if there is no result.
- */
+ * Gets the parent permission set of a permission.
+ *
+ * @param {String} pPermId id of the permission
+ *
+ * @result {String} returns id of the parent set of the given permission. Never 'null', empty string if there is no result.
+ */
PermissionUtil.getParentSet = function(pPermId) {
- var sqlStr = "select ASYS_PERMISSIONSET_ID from ASYS_PERMISSION"
- + " where ASYS_PERMISSIONID = '" + pPermId + "'";
- return db.cell(sqlStr, alias);
+ return newSelect("ASYS_PERMISSIONSET_ID", alias)
+ .from("ASYS_PERMISSION")
+ .where("ASYS_PERMISSION.ASYS_PERMISSIONID", pPermId)
+ .cell();
}
/**
- * Gets the parent permission set of a set.
- *
- * @param {String} pSetId id of the permission set
- *
- * @result {String} returns id of the parent permission set of the given set. Never 'null', empty string if there is no result.
- */
+ * Gets the parent permission set of a set.
+ *
+ * @param {String} pSetId id of the permission set
+ *
+ * @result {String} returns id of the parent permission set of the given set. Never 'null', empty string if there is no result.
+ */
PermissionUtil.getParentSetOfSet = function(pSetId) {
- var sqlStr = "select ASYS_PERMISSIONSET_ID from ASYS_PERMISSIONSET"
- + " where ASYS_PERMISSIONSETID = '" + pSetId + "'";
- return db.cell(sqlStr, alias);
+ return newSelect("ASYS_PERMISSIONSET_ID", alias)
+ .from("ASYS_PERMISSIONSET")
+ .where("ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID", pSetId)
+ .cell();
}
/**
- * Checks if the given permission set has any children left.
- *
- * @param {String} pSetId id of the permission set
- *
- * @result {Boolean} returns true if permission set has no children, otherwise false
- */
+ * Checks if the given permission set has any children left.
+ *
+ * @param {String} pSetId id of the permission set
+ *
+ * @result {Boolean} returns true if permission set has no children, otherwise false
+ */
PermissionUtil.setIsEmpty = function(pSetId) {
var subSets = PermissionUtil.getChildSetsOfSet(pSetId);
var subPerms = PermissionUtil.getPermissions([pSetId]);
@@ -356,42 +380,48 @@ function PermissionUtil () {}
}
/**
- * Returns all subordinated permissions of the given permission sets.
- *
- * @param {String[]} pSetIds ids of the permission sets
- *
- * @result {String[]} array with ids of all subordinated permissions. The result can never be null.
- */
+ * Returns all subordinated permissions of the given permission sets.
+ *
+ * @param {String[]} pSetIds ids of the permission sets
+ *
+ * @result {String[]} array with ids of all subordinated permissions. The result can never be null.
+ */
PermissionUtil.getPermissions = function(pSetIds) {
- return db.table("select ASYS_PERMISSIONID from ASYS_PERMISSION where ASYS_PERMISSION.ASYS_PERMISSIONSET_ID in ('" + pSetIds.join("','") + "')", alias);
+ return newSelect("ASYS_PERMISSIONID", alias)
+ .from("ASYS_PERMISSION")
+ .whereIfSet("ASYS_PERMISSION.ASYS_PERMISSIONSET_ID", pSetIds, SqlBuilder.IN())
+ .arrayColumn(true); // returns empty array if pSetIds is an empty array
}
/**
- * Returns the condition type of the given permission.
- *
- * @param {String} pPermId the id of the permission, mandatory
- *
- * @result {String} returns the value of condtype (1 or 0). Never 'null', empty string if there is no result.
- */
+ * Returns the condition type of the given permission.
+ *
+ * @param {String} pPermId the id of the permission, mandatory
+ *
+ * @result {String} returns the value of condtype (1 or 0). Never 'null', empty string if there is no result.
+ */
PermissionUtil.getCondType = function(pPermId) {
- return db.cell("select CONDTYPE from ASYS_PERMISSION where ASYS_PERMISSION.ASYS_PERMISSIONID = '" + pPermId + "'", alias);
+ return newSelect("CONDTYPE", alias)
+ .from("ASYS_PERMISSION")
+ .where("ASYS_PERMISSION.ASYS_PERMISSIONID", pPermId)
+ .cell();
}
/**
- * Inserts a new instance of a permission set into ASYS_PERMISSIONSET.
- *
- * @param {String} pParentPermSetId parent permission set, empty if root node
- *
- * @param {String} pEntity entity to which the PermissionSet is linked, mandatory
- *
- * @param {String} pRole Role to which the PermissionSet is linked, mandatory
- *
- * @param {String} pField Field to which the PermissionSet is linked, empty if no field permission
- *
- * @param {String} pAccessType Entity, Record or Field (E, R, F), mandatory
- *
- * @result {Integer} returns id of the inserted permission set
- */
+ * Inserts a new instance of a permission set into ASYS_PERMISSIONSET.
+ *
+ * @param {String} pParentPermSetId parent permission set, empty if root node
+ *
+ * @param {String} pEntity entity to which the PermissionSet is linked, mandatory
+ *
+ * @param {String} pRole Role to which the PermissionSet is linked, mandatory
+ *
+ * @param {String} pField Field to which the PermissionSet is linked, empty if no field permission
+ *
+ * @param {String} pAccessType Entity, Record or Field (E, R, F), mandatory
+ *
+ * @result {Integer} returns id of the inserted permission set
+ */
PermissionUtil.insertSet = function(pParentPermSetId, pEntity, pRole, pField, pAccessType) {
var table = "ASYS_PERMISSIONSET";
var cols = [
@@ -403,24 +433,24 @@ function PermissionUtil () {}
"ROLE_ID"
];
var setId = util.getNewUUID();
- var vals = [pAccessType, setId, pParentPermSetId, pEntity, pField, pRole];
+ var vals = [pAccessType, setId, pParentPermSetId, pEntity, pField, pRole];
db.insertData(table, cols, null, vals, alias);
return setId;
}
/**
- * Inserts a new instance of a permission into ASYS_PERMISSION.
- *
- * @param {String} pParentSetId parent permission set, mandatory
- *
- * @param {String} pCond condition of the permission, empty if no condition
- *
- * @param {String} pCondType condition Type of the permission, should nearly always be "true"
- *
- * @param {String} pPermId id of the new permission (can be empty/null)
- *
- * @result {Integer} returns id of the inserted permission
- */
+ * Inserts a new instance of a permission into ASYS_PERMISSION.
+ *
+ * @param {String} pParentSetId parent permission set, mandatory
+ *
+ * @param {String} pCond condition of the permission, empty if no condition
+ *
+ * @param {String} pCondType condition Type of the permission, should nearly always be "true"
+ *
+ * @param {String} pPermId id of the new permission (can be empty/null)
+ *
+ * @result {Integer} returns id of the inserted permission
+ */
PermissionUtil.insertPermission = function(pParentSetId, pCond, pCondType, pPermId) {
var table = "ASYS_PERMISSION";
var cols = [
@@ -441,16 +471,16 @@ function PermissionUtil () {}
}
/**
- * Inserts a new instance of a permission action into ASYS_PERMISSIONACTION.
- *
- * @param {String} pParentPermId parent permission, mandatory
- *
- * @param {String} pAction title of action (view, create,...), mandatory
- *
- * @param {String} pActionId id of the new permission action
- *
- * @result {Integer} returns id of the inserted permission action, returns null if insert was not possible
- */
+ * Inserts a new instance of a permission action into ASYS_PERMISSIONACTION.
+ *
+ * @param {String} pParentPermId parent permission, mandatory
+ *
+ * @param {String} pAction title of action (view, create,...), mandatory
+ *
+ * @param {String} pActionId id of the new permission action
+ *
+ * @result {Integer} returns id of the inserted permission action, returns null if insert was not possible
+ */
PermissionUtil.insertAction = function(pParentPermId, pAction, pActionId) {
var table = "ASYS_PERMISSIONACTION";
var cols = [
@@ -458,10 +488,14 @@ function PermissionUtil () {}
"ASYS_PERMISSIONACTIONID",
"ASYS_PERMISSION_ID"
];
+
+ var actionNotExists = newSelect("ASYS_PERMISSIONACTIONID", alias)
+ .from("ASYS_PERMISSIONACTION")
+ .whereIfSet("ASYS_PERMISSIONACTION.ASYS_PERMISSIONACTIONID", pActionId)
+ .cell(true) == "";
+
var actionId;
- var sqlStr = "select ASYS_PERMISSIONACTIONID from ASYS_PERMISSIONACTION where ASYS_PERMISSIONACTIONID = '" + pActionId + "'";
-
- if (pActionId != null & pActionId != "" && pActionId != undefined && db.cell(sqlStr, alias) == "") {
+ if (pActionId != null & pActionId != "" && pActionId != undefined && actionNotExists) {
actionId = pActionId;
} else {
actionId = util.getNewUUID(); // if same id is already in db -> create new UID
@@ -481,9 +515,10 @@ function PermissionUtil () {}
* @result {String} returns the condition of a permission
*/
PermissionUtil.getCond = function(pPermId) {
- var table = "ASYS_PERMISSION";
- var sqlStr = "select COND from " + table + " where ASYS_PERMISSIONID = '" + pPermId + "'";
- return db.cell(sqlStr, alias);
+ return newSelect("COND", alias)
+ .from("ASYS_PERMISSION")
+ .where("ASYS_PERMISSION.ASYS_PERMISSIONID", pPermId)
+ .cell();
}
/**
@@ -494,12 +529,12 @@ function PermissionUtil () {}
* @result {Boolean} true if permission exists, otherwise false
*/
PermissionUtil.permissionExists = function(pPermId) {
- var table = "ASYS_PERMISSION";
- var sqlStr = "select COUNT(*) from " + table + " where ASYS_PERMISSIONID = '" + pPermId + "'";
- if (db.cell(sqlStr, alias) != "0") {
- return true;
- }
- return false;
+ var permissionCount = newSelect("COUNT(*)", alias)
+ .from("ASYS_PERMISSION")
+ .whereIfSet("ASYS_PERMISSION.ASYS_PERMISSIONID", pPermId)
+ .cell(true, "0");
+
+ return permissionCount != "0";
}
/**
@@ -512,11 +547,13 @@ function PermissionUtil () {}
* @result {Boolean} true if action exists, otherwise false
*/
PermissionUtil.actionExists = function(pAction, pPermId) {
- var sqlStr = "select COUNT(*) from ASYS_PERMISSIONACTION where ACTION = '" + pAction + "' and ASYS_PERMISSION_ID = '" + pPermId + "'";
- if (db.cell(sqlStr, alias) != "0") {
- return true;
- }
- return false;
+ var permissionActionCount = newSelect("COUNT(*)", alias)
+ .from("ASYS_PERMISSIONACTION")
+ .where("ASYS_PERMISSIONACTION.ACTION", pAction)
+ .and("ASYS_PERMISSIONACTION.ASYS_PERMISSION_ID", pPermId)
+ .cell();
+
+ return permissionActionCount != 0;
}
/**
@@ -538,36 +575,39 @@ function PermissionUtil () {}
*
*/
PermissionUtil.getPermission = function(pRole, pEntity, pField, pAccesstype, pCondition, pCondtype) {
- var sqlStr = "";
- var sqlExt = "";
+ var permissionSelect = newSelect("ASYS_PERMISSION.ASYS_PERMISSIONID", alias)
+ .from("ASYS_PERMISSIONSET")
+ .join("ASYS_PERMISSION", "ASYS_PERMISSION.ASYS_PERMISSIONSET_ID = ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID")
+ .where("ASYS_PERMISSIONSET.ENTITY_ID", pEntity)
+ .and("ASYS_PERMISSIONSET.ROLE_ID", pRole)
+ .and("ASYS_PERMISSIONSET.ACCESSTYPE", pAccesstype)
+
var emptyCond = PermissionUtil.getEmptyCondString(pEntity);
if (checkInput([pCondition])) {
if (pCondition == emptyCond) {
- sqlExt += " and (" + sqlHelper.castLob("ASYS_PERMISSION.COND", 254) + " = '" + emptyCond + "' or COND is null)";
+ permissionSelect.and(new SqlBuilder(alias).where()
+ .or("ASYS_PERMISSION.COND", emptyCond, sqlHelper.castLob("#", 254) + " = ?")
+ .or("COND is null")
+ );
} else {
// SqlMaskingUtils.castLob causes an error in this case (at least on derby-db)
// derby-db max size of char is 254 and castLob casts to char first, then to varchar
// size of a condition varies and can be bigger than 254
// this can cause errors on DBMS with small varchar max size
- sqlExt += " and cast(ASYS_PERMISSION.COND as varchar(" + pCondition.length + ")) = '" + pCondition + "'";
+ permissionSelect.and("ASYS_PERMISSION.COND", pCondition, "# as varchar(" + pCondition.length + ") = ?")
}
}
if (checkInput([pField])) {
- sqlExt += " and FIELD_ID = '" + pField + "'";
+ permissionSelect.and("ASYS_PERMISSIONSET.FIELD_ID", pField)
}
if (checkInput([pCondtype])) {
- sqlExt += " and CONDTYPE = " + pCondtype + "";
+ permissionSelect.and("ASYS_PERMISSION.CONDTYPE", pCondtype)
}
-
- sqlStr = "select ASYS_PERMISSION.ASYS_PERMISSIONID from ASYS_PERMISSIONSET"
- + " join ASYS_PERMISSION on ASYS_PERMISSION.ASYS_PERMISSIONSET_ID = ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID"
- + " where ENTITY_ID = '" + pEntity + "' and ROLE_ID = '" + pRole + "'"
- + " and ACCESSTYPE = '" + pAccesstype + "'" + sqlExt;
- var permId = db.cell(sqlStr, alias);
- return permId;
+
+ return permissionSelect.cell();
}
/**
@@ -578,9 +618,8 @@ function PermissionUtil () {}
* @result {Integer} returns number of deleted records
*/
PermissionUtil.deleteAction = function(pActionId) {
- var table = "ASYS_PERMISSIONACTION";
- var cond = " ASYS_PERMISSIONACTIONID = '" + pActionId + "'";
- return db.deleteData(table, cond, alias);
+ return newWhereIfSet("ASYS_PERMISSIONACTION.ASYS_PERMISSIONACTIONID", pActionId, undefined, undefined, alias)
+ .deleteData(true, "ASYS_PERMISSIONACTION");
}
} //end of block
diff --git a/process/ctiServerEvents/process.js b/process/ctiServerEvents/process.js
index dd4304b26befdea3f4a230ff65bdbc6f558d0620..d199d0b8378b703cd78a1fc2a8c5ccd44f9a49da 100644
--- a/process/ctiServerEvents/process.js
+++ b/process/ctiServerEvents/process.js
@@ -91,8 +91,7 @@ var disconnectingHandlerFn = function()
if (lastCallData.length == 0)
return null;
- var lastAnswermode, callBeginTime;
- [lastAnswermode, callBeginTime] = lastCallData
+ var [lastAnswermode, callBeginTime] = lastCallData
var isMissedCall = lastAnswermode == "" || lastAnswermode == $KeywordRegistry.callAnswerMode$missed();//no TALKING state was called -> this means that the call has been missed
var cols = ["DATE_EDIT"];