Merge master

entity/Context_entity/recordcontainers/jdito/contentProcess.js

@@ -2,11 +2,4 @@ import("system.vars");
 import("system.result");
 import("Context_lib");
 
-if (vars.exists("$param.ContextId_param") && vars.get("$param.ContextId_param"))
-{
-    result.object(ContextUtils.getContext(vars.get("$param.ContextId_param")));
-}
-else
-{
-    result.object(ContextUtils.getContexts(true));
-}
\ No newline at end of file
+result.object(ContextUtils.getContexts(true));

entity/ModuleTree_entity/ModuleTree_entity.aod

@@ -37,6 +37,16 @@
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContextName_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ID_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
     </entityProvider>
     <entityField>
       <name>PARENT_ID</name>

entity/ObjectRelation_entity/entityfields/keywordobjectrelationtype/children/containername_param/valueProcess.js

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

entity/ObjectRelation_entity/entityfields/objectrelations/children/providertype_param/valueProcess.js

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

entity/Object_entity/Object_entity.aod

@@ -75,14 +75,14 @@
           <isConsumer v="false" />
         </entityDependency>
         <entityDependency>
-          <name>1586ace7-8c27-43cc-8288-cc7a68670c09</name>
-          <entityName>ActivityLink_entity</entityName>
+          <name>445b79b3-e826-40d1-b6c2-46d62daf0818</name>
+          <entityName>TaskLink_entity</entityName>
           <fieldName>Objects</fieldName>
           <isConsumer v="false" />
         </entityDependency>
         <entityDependency>
-          <name>445b79b3-e826-40d1-b6c2-46d62daf0818</name>
-          <entityName>TaskLink_entity</entityName>
+          <name>0a2aa5c9-1ba2-41bd-b5f4-3a761efbcf2e</name>
+          <entityName>ActivityLink_entity</entityName>
           <fieldName>Objects</fieldName>
           <isConsumer v="false" />
         </entityDependency>
@@ -96,6 +96,7 @@
         <entityParameter>
           <name>ObjectType_param</name>
           <expose v="true" />
+          <triggerRecalculation v="true" />
           <mandatory v="true" />
         </entityParameter>
       </children>

entity/Object_entity/recordcontainers/jdito/contentProcess.js

+import("system.logging");
 import("system.db");
 import("system.vars");
 import("system.result");
 import("Context_lib");
-
+logging.log(vars.get("$param.ObjectType_param"))
+logging.log(vars.get("$param.ObjectRowId_param"))
 if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"))
 {
     if (vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))

entity/Offer_entity/entityfields/keywordprobability/children/containername_param/valueProcess.js

+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.offerProbability());
\ No newline at end of file

entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js

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

entity/Organisation_entity/entityfields/contacts/children/orgid_param/valueProcess.js

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

entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js

+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectPricePolitics());
\ No newline at end of file

entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js

+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectStrenght());
\ No newline at end of file

entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js

+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectWeakness());
\ No newline at end of file

entity/Product_entity/entityfields/stock/children/productid_param/valueProcess.js

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

entity/Product_entity/entityfields/stockcount/children/productid_param/valueProcess.js

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

entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod

@@ -24,7 +24,6 @@
       <title>Reason</title>
       <consumer>KeywordWonLost</consumer>
       <selectionMode>SINGLE</selectionMode>
-      <onValidation>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/reason/onValidation.js</onValidation>
     </entityField>
     <entityField>
       <name>SALESPROJECT_COMPETITIONID</name>

entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/valueProcess.js

+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectPhase());
\ No newline at end of file

entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js

+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectPricePolitics());
\ No newline at end of file

entity/SalesprojectCompetition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js

+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectCompetitionState());
\ No newline at end of file

entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js

+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectStrenght());
\ No newline at end of file

entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js

+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectWeakness(), "ORGANISATION.WEAKNESS");
+result.string(sql);
\ No newline at end of file