Skip to content
Snippets Groups Projects
Commit 7688912f authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

misc. fixes

parent 112569ed
No related branches found
No related tags found
No related merge requests found
......@@ -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">
......
......@@ -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);
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
......@@ -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")
......
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