From 7688912fb19c7ab1565e6b132148ee6f772c066a Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 10 May 2019 14:10:47 +0200
Subject: [PATCH] misc. fixes
---
.../2019.2/data/example_attribute/AttributeUsage.xml | 8 ++++----
.../entityfields/newappointment/onActionProcess.js | 2 +-
entity/Salesproject_entity/afterOperatingState.js | 10 ++++++----
process/Context_lib/process.js | 5 +----
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml b/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
index 3d1f4c3b29..ed487a5a71 100644
--- a/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
+++ b/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
@@ -442,7 +442,7 @@
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="1f2749b3-1402-46fb-892a-e68b9a39065d"/>
<column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
- <column name="MIN_COUNT" valueNumeric="1"/>
+ <column name="MIN_COUNT" valueNumeric="0"/>
<column name="OBJECT_TYPE" value="Organisation"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
@@ -453,7 +453,7 @@
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="140b87a4-4f8e-4ae5-84d5-4bc26fa51901"/>
<column name="AB_ATTRIBUTE_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
- <column name="MIN_COUNT" valueNumeric="1"/>
+ <column name="MIN_COUNT" valueNumeric="0"/>
<column name="OBJECT_TYPE" value="Organisation"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
@@ -536,7 +536,7 @@
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="05576033-1bee-4547-ab82-fdfcdd039642"/>
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
- <column name="MIN_COUNT" valueNumeric="2"/>
+ <column name="MIN_COUNT" valueNumeric="1"/>
<column name="OBJECT_TYPE" value="Organisation"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
@@ -547,7 +547,7 @@
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="4ff67f07-1aa7-47d4-8e5f-c4860793085a"/>
<column name="AB_ATTRIBUTE_ID" value="915d566f-acbe-448c-a7b6-11898adc3880"/>
- <column name="MIN_COUNT" valueNumeric="1"/>
+ <column name="MIN_COUNT" valueNumeric="0"/>
<column name="OBJECT_TYPE" value="Organisation"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
diff --git a/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js b/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
index fde05a49a0..45a55b3998 100644
--- a/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
@@ -7,7 +7,7 @@ import("Context_lib");
var params = {};
-params["Entry_param"] = JSON.stringify(CalendarUtil.createEntry(calendars.VEVENT, "neue Termin weissu", "", false, ContextUtils.getCurrentContextId(), vars.get("$field.ORGANISATIONID")));
+params["Entry_param"] = JSON.stringify(CalendarUtil.createEntry(calendars.VEVENT, "", "", false, ContextUtils.getCurrentContextId(), vars.get("$field.ORGANISATIONID")));
neon.openContext("Appointment", "AppointmentEdit_view", null, neon.OPERATINGSTATE_NEW, params);
diff --git a/entity/Salesproject_entity/afterOperatingState.js b/entity/Salesproject_entity/afterOperatingState.js
index fb90fb67eb..e93da299ee 100644
--- a/entity/Salesproject_entity/afterOperatingState.js
+++ b/entity/Salesproject_entity/afterOperatingState.js
@@ -1,6 +1,8 @@
import("system.vars");
import("system.neon");
-if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
-{
- neon.refresh();
-}
\ No newline at end of file
+
+//TODO: error on save, why should be a refresh necessary
+//if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
+//{
+// neon.refresh();
+//}
\ No newline at end of file
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index fc3833233e..f38b695d45 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -382,10 +382,7 @@ ContextUtils.getSelectMap = function()
], "", false))
,"Task": ContextSelector.create("TASK", "TASKID", "SUBJECT")
,"Campaign": ContextSelector.create("CAMPAIGN", "CAMPAIGNID")
- .setTitleExpression(maskingUtils.concat([
- maskingUtils.cast("CAMPAIGN.NAME", SQLTYPES.VARCHAR, 10),
- maskingUtils.cast("CAMPAIGNSTEP.NAME", SQLTYPES.VARCHAR, 10)
- ], " - ", false))
+ .setTitleExpression(maskingUtils.concat(["CAMPAIGN.NAME", "CAMPAIGNSTEP.NAME"], " - ", false))
.setContactIdField("CAMPAIGNPARTICIPANT.CONTACT_ID")
.setJoinExpression("left join CAMPAIGNPARTICIPANT on CAMPAIGNPARTICIPANT.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID " +
"left join CAMPAIGNSTEP on CAMPAIGNSTEP.CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID")
--
GitLab