diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js b/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js index df2bf1c18375c03aa745a1fb7b5044aca7d97296..c9549a3eda56f5f65408c47a8d288b8897beb3cc 100644 --- a/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js +++ b/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js @@ -35,7 +35,7 @@ var columns = ["OBJECTMEMBERID" , "RESPONSIBLE"]; var values = [util.getNewUUID() - , tools.getUserByAttribute(tools.TITLE, vars.get("$field.USER_NEW"), tools.PROFILE_FULL)[tools.PARAMS][tools.CONTACTID] + , tools.getUserByAttribute(tools.TITLE, vars.get("$field.USER_NEW"), tools.PROFILE_DEFAULT)[tools.PARAMS][tools.CONTACTID] , vars.get("$field.SALESPROJECTID") , ContextUtils.getCurrentContextId() , 1]; diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js index 65fcefca0a6d41e0b9df4750493e81f5cca1a0c5..8441fd3a7e8129cc43d2960e17b51148cd141ade 100644 --- a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js +++ b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js @@ -79,11 +79,11 @@ vars.get("$local.changed").forEach(function(fieldName) { if(!contactId)//if no one is responsible: use the contact that created this salesproject { - contactId = tools.getUserByAttribute(tools.TITLE, vars.get("$field.USER_NEW"), tools.PROFILE_FULL)[tools.PARAMS][tools.CONTACTID]; + contactId = tools.getUserByAttribute(tools.TITLE, vars.get("$field.USER_NEW"), tools.PROFILE_DEFAULT )[tools.PARAMS][tools.CONTACTID]; if(!contactId || contactId == "")//user_new could be empty since this column got added later -> user_edit as fallback (always filled) { - contactId = tools.getUserByAttribute(tools.TITLE, vars.get("$field.USER_EDIT"), tools.PROFILE_FULL)[tools.PARAMS][tools.CONTACTID]; + contactId = tools.getUserByAttribute(tools.TITLE, vars.get("$field.USER_EDIT"), tools.PROFILE_DEFAULT )[tools.PARAMS][tools.CONTACTID]; } } diff --git a/process/CreateOfferDeniedActivity_workflowService/process.js b/process/CreateOfferDeniedActivity_workflowService/process.js index 1caa7274d44e71bf1b51ce52e852503ff62aab01..afee90a573046f94f18f94454aca82e40950b6c1 100644 --- a/process/CreateOfferDeniedActivity_workflowService/process.js +++ b/process/CreateOfferDeniedActivity_workflowService/process.js @@ -43,7 +43,7 @@ var tasks = JSON.parse(workflow.getTasks(loadConfig)); var requestor; tasks.forEach(function (task){ - requestor = tools.getUserByAttribute(tools.NAME, task.assignee, tools.PROFILE_FULL)[tools.PARAMS][tools.CONTACTID]; + requestor = tools.getUserByAttribute(tools.NAME, task.assignee, tools.PROFILE_DEFAULT)[tools.PARAMS][tools.CONTACTID]; }); var configLink = entities.createConfigForAddingRows(); @@ -53,7 +53,7 @@ configLink.fieldValues({ "OBJECT_ROWID": variables.targetId }); -var userNewContactId = tools.getUserByAttribute([tools.TITLE], variables.userNew, tools.PROFILE_FULL)[tools.PARAMS][tools.CONTACTID]; +var userNewContactId = tools.getUserByAttribute([tools.TITLE], variables.userNew, tools.PROFILE_DEFAULT)[tools.PARAMS][tools.CONTACTID]; var config = entities.createConfigForAddingRows(); config.entity("Task_entity"); diff --git a/process/CreateOfferNotification_workflowService/process.js b/process/CreateOfferNotification_workflowService/process.js index d6a3583a95aac54f9870dd524d9cf72e74a60480..0c78b5040767993d35f0e209800f0263dee7af28 100644 --- a/process/CreateOfferNotification_workflowService/process.js +++ b/process/CreateOfferNotification_workflowService/process.js @@ -9,11 +9,12 @@ import("system.vars"); import("system.notification"); var variables = JSON.parse(vars.get("$local.value")); -var userNewId = tools.getUserByAttribute([tools.TITLE], variables.userNew, tools.PROFILE_FULL)[tools.NAME]; +var userNewId = tools.getUserByAttribute([tools.TITLE], variables.userNew, tools.PROFILE_DEFAULT)[tools.NAME]; +var masking = new SqlMaskingUtils(); var offerData = newSelect([ "OFFER.ACTIONUSER", - "concat(OFFER.OFFERCODE, '-', OFFER.VERSNR)" + masking.concatWithSeparator(["OFFER.OFFERCODE", "OFFER.VERSNR"], "-") ]).from("OFFER") .where("OFFER.OFFERID", variables.targetId) .arrayRow();