Skip to content
Snippets Groups Projects
Commit e8b09ad2 authored by Sebastian Pongratz's avatar Sebastian Pongratz :ping_pong:
Browse files

[Projekt: xRM-ContactManagement][TicketNr.: 1085831][Error " Unexpected token:...

[Projekt: xRM-ContactManagement][TicketNr.: 1085831][Error " Unexpected token: C" wenn eine Person bearbeitet wird ]
parent e1734093
No related branches found
No related tags found
No related merge requests found
......@@ -34,7 +34,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>ObjectRowId_param</name>
<name>ObjectRowIds_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
......
......@@ -15,8 +15,8 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
&& vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
{
var contextList = JSON.parse(vars.get("$param.ObjectType_param"));
var contactId = JSON.parse(vars.get("$param.ObjectRowId_param"));
var data = _get360Data(contactId, contextList);
var contactIds = JSON.parse(vars.get("$param.ObjectRowIds_param"));
var data = _get360Data(contactIds, contextList);
// #1075280 added null-check to prevent misbehaviour
if(vars.get("$local.idvalues") != null)
......@@ -59,7 +59,7 @@ function _get360Data(pContactId, pContextList)
var roles = newSelect(["OBJECTMEMBER.OBJECT_ROWID", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.MemberRole(), "MEMBERROLE")])
.from("OBJECTMEMBER")
.where("OBJECTMEMBER.OBJECT_TYPE", "Salesproject")
.and("OBJECTMEMBER.CONTACT_ID", contactId)
.and("OBJECTMEMBER.CONTACT_ID", contactIds)
.orderBy("OBJECTMEMBER.OBJECT_ROWID")
.table();
//one select outside of the for each for performance, we assign the roles to roleObj so we can add them in the for each accordingly
......
......@@ -534,7 +534,7 @@
</dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
<name>ObjectRowIds_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
......
......@@ -736,7 +736,7 @@
</dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
<name>ObjectRowIds_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
......
......@@ -11,8 +11,8 @@ var contactId = vars.get("$field.CONTACTID");
var linkedObject = new HasLinkedObjectTester()
.andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : contactId})
.andNoEntityRows("360Degree_entity", "PersonObjects", {ObjectRowId_param : contactId , ObjectStatus_param : vars.get("$field.STATUS")})
.andNoEntityRows("ObjectTree_entity", "TreeProvider", {ObjectIds_param : [vars.get("$field.CONTACTID"), vars.get("$field.PERSON_ID")], ObjectTypes_param : currentContext})
.andNoEntityRows("360Degree_entity", "PersonObjects", {ObjectRowIds_param : JSON.stringify([contactId]) , ObjectStatus_param : vars.get("$field.STATUS")})
.andNoEntityRows("ObjectTree_entity", "TreeProvider", {ObjectIds_param : JSON.stringify([vars.get("$field.CONTACTID"), vars.get("$field.PERSON_ID")]), ObjectTypes_param : currentContext})
//.andNoEntityRows("AttributeRelation_entity", "TreeProvider", {ObjectRowId_param : contactId, ObjectType_param : currentContext})
//.andNoEntityRows("DistrictResponsible_entity", "OrganisationResponsibles", {OrgUid_param : vars.get("$field.ORGANISATION_CONTACTID")}) //District Responsible and Object Tree is default data record
.andNoEntityRows("Document_entity", "Documents", {AssignmentRowId_param : contactId, AssignmentTable_param : "RELATION"})
......
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