Merge branch '1036821-contextnames' into 'master'

1036821 contextnames

See merge request xrm/basic!34

entity/Attribute_entity/titleProcess.js

+import("Context_lib");
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.FULL_ATTRIBUTE_NAME"));
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.FULL_ATTRIBUTE_NAME")));
\ No newline at end of file

entity/Contact_entity/Contact_entity.aod

@@ -2,6 +2,7 @@
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
   <name>Contact_entity</name>
   <title>Contact</title>
+  <description></description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
   <onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
@@ -27,7 +28,6 @@
       <title>Company</title>
       <consumer>Organisations</consumer>
       <mandatory v="false" />
-      <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
       <onValidation>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValidation.js</onValidation>
     </entityField>
     <entityField>
@@ -299,10 +299,6 @@
           <name>DATE_EDIT.value</name>
           <recordfield>CONTACT.DATE_EDIT</recordfield>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ORGANISATION_ID.displayValue</name>
-          <recordfield>ORGANISATION.NAME</recordfield>
-        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>

entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js

-import("system.result");
-import("system.db");
-import("system.vars");
-import("Contact_lib");
-
-var organisationId = vars.get("$field.ORGANISATION_ID");
-var res = OrganisationUtils.getNameByOrganisationId(organisationId);
-
-result.string(res);
\ No newline at end of file

entity/Contract_entity/titleProcess.js

+import("Context_lib");
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.CONTRACTCODE_DISPLAY_fieldGroup"));
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.CONTRACTCODE_DISPLAY_fieldGroup")));
\ No newline at end of file

entity/Countries_Entity/titleProcess.js

+import("Context_lib");
 import("system.result");
 import("system.vars");
-result.string(vars.get("$field.NAME_TRANSLATED"));
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.NAME_TRANSLATED")));
\ No newline at end of file

entity/Employee_entity/titleProcess.js

+import("Context_lib");
 import("system.vars");
 import("system.result");
 
-result.string((vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME")).trim());
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle((vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME")).trim()));
\ No newline at end of file

entity/KeywordAttribute_entity/titleProcess.js

+import("Context_lib");
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.NAME"));
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.NAME")));
\ No newline at end of file

entity/KeywordEntry_entity/titleProcess.js

+import("Context_lib");
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.TITLE_TRANSLATED"));
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.TITLE_TRANSLATED")));
\ No newline at end of file

entity/ObjectRelationType_entity/titleProcess.js

+import("Context_lib");
 import("system.translate");
 import("system.vars");
 import("system.result");
 
 if (vars.exists("$param.OnlyFirstSide_param") && vars.get("$param.OnlyFirstSide_param") == "1" && vars.get("$field.DIRECTION") != "same")
 {
-    result.string(translate.text(vars.get("$field.SOURCE_RELATION_TITLE")) + " -> " + translate.text(vars.get("$field.DEST_RELATION_TITLE")));
+    result.string(ContextUtils.prefixWithCurrentContextTitle(translate.text(vars.get("$field.SOURCE_RELATION_TITLE")) + " -> " + translate.text(vars.get("$field.DEST_RELATION_TITLE"))));
 }
 else
 {
-    result.string(translate.text(vars.get("$field.SOURCE_RELATION_TITLE")));
+    result.string(ContextUtils.prefixWithCurrentContextTitle(translate.text(vars.get("$field.SOURCE_RELATION_TITLE"))));
 }
\ No newline at end of file

entity/Offer_entity/Offer_entity.aod

@@ -240,17 +240,6 @@
         <element>VERSNR</element>
       </fields>
     </entityFieldGroup>
-    <entityFieldGroup>
-      <name>Offer_OfferCode_VersNr_fieldgroup</name>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offer_offercode_versnr_fieldgroup/valueProcess.js</valueProcess>
-      <title>Offer number</title>
-      <description>"Offer " + OfferCode + VersNr</description>
-      <state>READONLY</state>
-      <fields>
-        <element>OFFERCODE</element>
-        <element>VERSNR</element>
-      </fields>
-    </entityFieldGroup>
     <entityParameter>
       <name>ContactId_param</name>
       <expose v="true" />

entity/Offer_entity/entityfields/offer_offercode_versnr_fieldgroup/valueProcess.js

-import("system.translate");
-import("system.result");
-import("system.vars");
-
-// TODO: Kern-Fix, VersNr wird bei indirektem Aufruf nicht geladen, wenn kein "$field.VERSNR" hier ist:
-"$field.VERSNR"
-
-result.string(translate.text("Offer") + " " + vars.get("$field.OfferCode_VersNr_fieldgroup")); 

entity/Offer_entity/titleProcess.js

+import("Context_lib");
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.Offer_OfferCode_VersNr_fieldgroup"));
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.OfferCode_VersNr_fieldgroup")));
\ No newline at end of file

entity/Order_entity/Order_entity.aod

@@ -203,17 +203,6 @@
         <element>VERSNR</element>
       </fields>
     </entityFieldGroup>
-    <entityFieldGroup>
-      <name>Order_OrderCode_VersNr_fieldgroup</name>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/order_ordercode_versnr_fieldgroup/valueProcess.js</valueProcess>
-      <title>Receipt number</title>
-      <description>"Receipt " + ReceiptCode + VersNr</description>
-      <state>READONLY</state>
-      <fields>
-        <element>SALESORDERCODE</element>
-        <element>VERSNR</element>
-      </fields>
-    </entityFieldGroup>
     <entityParameter>
       <name>ContactId_param</name>
       <expose v="true" />

entity/Order_entity/entityfields/order_ordercode_versnr_fieldgroup/valueProcess.js

-import("system.translate");
-import("system.result");
-import("system.vars");
-
-// TODO: Kern-Fix, VersNr wird bei indirektem Aufruf nicht geladen, wenn kein "$field.VERSNR" hier ist:
-"$field.VERSNR"
-
-result.string(translate.text("Order") + " " + vars.get("$field.OrderCode_VersNr_fieldgroup")); 

entity/Order_entity/titleProcess.js

+import("Context_lib");
 import("system.translate");
 import("system.vars");
 import("system.result");
 
-result.string(translate.text("Receipt") + " " + vars.get("$field.OrderCode_VersNr_fieldgroup"));
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.OrderCode_VersNr_fieldgroup")));

entity/Organisation_entity/titleProcess.js

+import("Context_lib");
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.NAME"))
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.NAME")))
\ No newline at end of file

entity/Person_entity/titleProcess.js

+import("Context_lib");
 import("system.vars");
 import("system.result");
 import("Util_lib");
@@ -13,4 +14,4 @@ contact.lastname = vars.get("$field.LASTNAME");
 contact.organisationName = vars.get("$field.ORGANISATION_NAME");
 
 var renderer = new ContactTitleRenderer(contact, null);
-result.string(renderer.asString());
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(renderer.asString()));
\ No newline at end of file

entity/Product_entity/titleProcess.js

+import("Context_lib");
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.PRODUCTNAME"));
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.PRODUCTNAME")));
\ No newline at end of file

entity/SalesprojectMilestone_entity/titleProcess.js

+import("Context_lib");
 import("system.vars");
 import("system.translate");
 import("system.result");
 
 if (vars.exists("$field.TYPE") && vars.get("$field.TYPE"))
 {
-    result.string(translate.text("Milestones") + " " + translate.text(vars.get("$field.TYPE")));
+    result.string(ContextUtils.prefixWithCurrentContextTitle(translate.text("Milestones") + " " + translate.text(vars.get("$field.TYPE"))));
 }
 else
-    result.string(translate.text("Milestones"));
\ No newline at end of file
+    result.string(ContextUtils.prefixWithCurrentContextTitle(translate.text("Milestones")));
\ No newline at end of file

entity/Salesproject_entity/titleProcess.js

+import("Context_lib");
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.PROJECTTITLE"));
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.PROJECTTITLE")));
\ No newline at end of file