Merge origin/master

entity/Appointment_entity/Appointment_entity.aod

@@ -129,6 +129,36 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityConsumer>
+      <name>ObjectRelations</name>
+      <title>Relations</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ObjectRelation_entity</entityName>
+        <fieldName>AnyObject</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AnyObjectRowid_param</name>
+          <code>%aditoprj%/entity/Appointment_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js</code>
+          <expose v="true" />
+          <mandatory v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>AnyObjectType_param</name>
+          <code>%aditoprj%/entity/Appointment_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>AnyObjectRowid_param</name>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>AnyObjectType_param</name>
+      <description>PARAMETER</description>
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>

entity/Appointment_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js

+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.UID"))
\ No newline at end of file

entity/Appointment_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js

+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId())
\ No newline at end of file

entity/Appointment_entity/recordcontainers/jdito/contentProcess.js

@@ -6,7 +6,6 @@ import("system.datetime");
 import("system.eMath");
 import("system.util");
 
-//logging.log("contentProcess")
 if(vars.exists("$param.Entry_param"))
 {
     var entry = JSON.parse(vars.getString("$param.Entry_param"));

entity/ObjectRelation_entity/ObjectRelation_entity.aod

@@ -213,6 +213,12 @@
           <fieldName>ObjectRelation_dfo</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>f3b9bfa5-e04d-45b4-8bd6-baed4c7ceac0</name>
+          <entityName>Appointment_entity</entityName>
+          <fieldName>ObjectRelations</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>

preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod

@@ -30,3 +30,4 @@
   <indexsearchIncrementingIndexerBunchSize v="250" />
   <indexsearchMaximumHits v="50000" />
 </preferences>
+

process/Context_lib/process.js

@@ -63,7 +63,8 @@ ContextUtils._getSelectMap = function()
         "Salesproject_context": [maskingUtils.concat([maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10), "':'", "PROJECTTITLE"]), "SALESPROJECT", "SALESPROJECTID"],
         // TODO: keywords sind noch nicht in der DB somit gibt es nichts ähnliches zu getKeySQL.
         // maskingUtils.concat([SqlMaskingUtils.cast("CONTRACTCODE", "varchar", 10), getKeySQL("CONTRACTTYPE", "CONTRACTTYPE" )])
-        "Contract_context": [maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10), "CONTRACT", "CONTRACTID"]       
+        "Contract_context": [maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10), "CONTRACT", "CONTRACTID"],
+        "Appointment_context": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID"]
     }
 }