Skip to content
Snippets Groups Projects
Commit cd4ac46c authored by Sascha Schmidt's avatar Sascha Schmidt
Browse files

Fixes from MR/CR

parent de38a50d
No related branches found
No related tags found
No related merge requests found
import("system.neonFilter");
import("system.neon");
import("system.workflow");
import("system.vars");
......@@ -26,7 +27,9 @@ if (entityData["FORMRESULT"])
}, startVal);
if (newestTask.id !== null)
{
neon.openContextWithRecipe("WorkflowTask", "WorkflowTaskPreview_view", neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist([newestTask.id]).toString(), neon.OPERATINGSTATE_VIEW);
}
else
{
var params = {
......
......@@ -687,7 +687,7 @@ EwsClientSyncUtils.updateEntrysInSyncTable = function(pUserMapping, pUserLoginPr
var search = JSON.parse(pPropvalClob)["search"]; // search part of the filter JSON
var whereCond = db.toFilterCondition(JSON.stringify(search), type);
//--------------------------------------------------------------------------
if(whereCond)//global variables cannot be read here and must be passed per user
if(Utils.isNullOrEmptyString(whereCond)) //global variables cannot be read here and must be passed per user
{
whereCond = StringUtils.replaceAll(whereCond, "$$$global.user.contactId$$$", tempUserMapping[2]);
}
......
......@@ -72,12 +72,12 @@ FilterViewActionUtils.getUidsByEntityFilter = function (pContext, pFilter, pPara
.entity(ContextUtils.getEntity(pContext))
.fields(["#UID"]);
if (pFilter.filter)
if (Utils.isNullOrEmpty(pFilter.filter))
{
loadRowsConfig.filter(JSON.stringify(pFilter.filter));
}
if(pParameters)
if(Utils.isNullOrEmpty(pParameters))
{
Object.keys(pParameters).forEach(function(key){
loadRowsConfig.addParameter(key, pParameters[key])
......
......@@ -526,15 +526,15 @@ function iComm (pObject)
standard = "1";
}
//@deprecated It should be used ObjectRowid and ObjectType
objectRowId = objectRowId || contactId;
objectType = objectType || "Contact";
if (!address || !medium || !objectRowId)
{
return true;
}
//@deprecated It should be used ObjectRowid and ObjectType
objectRowId = objectRowId || contactId;
objectType = objectType || "Contact";
const COMMUNICATION = this.getTableCase("communication");
const COMMUNICATIONID = this.getColumnCase("communicationid");
const OBJECT_ROWID = this.getColumnCase("object_rowid");
......
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