diff --git a/entity/KnowledgeLink_entity/KnowledgeLink_entity.aod b/entity/KnowledgeLink_entity/KnowledgeLink_entity.aod
index b6d159ac4cf4fd8518c354cbee6bfb8d2e8ce82e..6b817307e82b88644ccaf5957c72db7d0606a134 100644
--- a/entity/KnowledgeLink_entity/KnowledgeLink_entity.aod
+++ b/entity/KnowledgeLink_entity/KnowledgeLink_entity.aod
@@ -58,17 +58,17 @@
</entityConsumer>
<entityConsumer>
<name>Objects</name>
- <dependency>
- <name>dependency</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>FilteredObjects</fieldName>
- </dependency>
<children>
<entityParameter>
<name>Entity_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeLink_entity/entityfields/objects/children/entity_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ObjectProxy_entity</entityName>
+ <fieldName>FilteredObjects</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>KnowledgeManagementId_param</name>
@@ -79,14 +79,6 @@
<targetContextField>OBJECT_TYPE</targetContextField>
<targetIdField>ROW_ID</targetIdField>
<documentation>%aditoprj%/entity/KnowledgeLink_entity/entityfields/byknowledgeid/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>c3ed10c1-db55-4e55-9c18-2b8d400df033</name>
- <entityName>KnowledgeManagement_entity</entityName>
- <fieldName>LinksByKnowledgeId</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -97,6 +89,14 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>c3ed10c1-db55-4e55-9c18-2b8d400df033</name>
+ <entityName>KnowledgeManagement_entity</entityName>
+ <fieldName>LinksByKnowledgeId</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityParameter>
<name>RowId_param</name>
diff --git a/entity/KnowledgeLink_entity/entityfields/object_type/displayValueProcess.js b/entity/KnowledgeLink_entity/entityfields/object_type/displayValueProcess.js
index 3922264dc37d0431952c91c91192f7c422453e7e..d966bec94ff0f576e1a1517e1916610086f415c3 100644
--- a/entity/KnowledgeLink_entity/entityfields/object_type/displayValueProcess.js
+++ b/entity/KnowledgeLink_entity/entityfields/object_type/displayValueProcess.js
@@ -1,7 +1,8 @@
+import("system.translate");
import("system.neon");
import("system.vars");
import("system.result");
import("Context_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.get("$field.OBJECT_TYPE"))
- result.string(ContextUtils.getTitle(vars.get("$field.OBJECT_TYPE")));
\ No newline at end of file
+ result.string(translate.text(ContextUtils.getTitle(vars.get("$field.OBJECT_TYPE"))));
\ No newline at end of file
diff --git a/entity/KnowledgeLink_entity/entityfields/row_id/displayValueProcess.js b/entity/KnowledgeLink_entity/entityfields/row_id/displayValueProcess.js
index 3dbbcf620a10c6c02d3326da49ece763bf738dc5..40928962d866a6000dd320e2dd0a557621adabe2 100644
--- a/entity/KnowledgeLink_entity/entityfields/row_id/displayValueProcess.js
+++ b/entity/KnowledgeLink_entity/entityfields/row_id/displayValueProcess.js
@@ -7,5 +7,6 @@ import("Context_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.ROW_ID")) {
result.string("");
} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
- result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT_TYPE"), vars.get("$field.ROW_ID"))));
+
+ result.string(ContextUtils.getTitleByContext(vars.get("$field.OBJECT_TYPE"), vars.get("$field.ROW_ID")));
}
\ No newline at end of file
diff --git a/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod b/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
index 8a1b967dc2eb4c6e46ca014c0382106906ca8450..4cc143f137158ab3bc3da5e2940ffca3b264e299 100644
--- a/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
+++ b/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
@@ -8,6 +8,7 @@
<grantUpdateProcess>%aditoprj%/entity/KnowledgeManagement_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/KnowledgeManagement_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/KnowledgeManagement_entity/contentTitleProcess.js</contentTitleProcess>
+ <afterUiInit>%aditoprj%/entity/KnowledgeManagement_entity/afterUiInit.js</afterUiInit>
<afterOperatingState>%aditoprj%/entity/KnowledgeManagement_entity/afterOperatingState.js</afterOperatingState>
<useFavorites v="true" />
<iconIdProcess>%aditoprj%/entity/KnowledgeManagement_entity/iconIdProcess.js</iconIdProcess>
@@ -101,36 +102,44 @@
<refreshParent v="true" />
<state>EDITABLE</state>
<onValidation>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/tagsbyknowledgeid/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>KnowledgeManagementTags_entity</entityName>
- <fieldName>ByKnowledgeManagementId</fieldName>
- </dependency>
<children>
<entityParameter>
<name>KnowledgeManagementId_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/tagsbyknowledgeid/children/knowledgemanagementid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KnowledgeManagementTags_entity</entityName>
+ <fieldName>ByKnowledgeManagementId</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>DiscussionsByKnowledgeId</name>
<refreshParent v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>KnowledgeDiscussion_entity</entityName>
- <fieldName>ByKnowledgeId</fieldName>
- </dependency>
<children>
<entityParameter>
<name>KnowledgeId_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/discussionsbyknowledgeid/children/knowledgeid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KnowledgeDiscussion_entity</entityName>
+ <fieldName>ByKnowledgeId</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>Provider</name>
<documentation>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/provider/documentation.adoc</documentation>
+ <dependencies>
+ <entityDependency>
+ <name>20c983b0-4575-4bd3-83ce-477458ece62d</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>KnowledgeManagements</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityConsumer>
<name>PersonContacts</name>
@@ -142,42 +151,37 @@
</entityConsumer>
<entityConsumer>
<name>KeywordKnowledgeType</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/keywordknowledgetype/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordPublish</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordPublish</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/keywordpublish/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>indexTag</name>
</entityField>
<entityConsumer>
<name>LinkedDocuments</name>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
<children>
<entityParameter>
<name>AssignmentTable_param</name>
@@ -188,6 +192,11 @@
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/linkeddocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>openEntryAsMail</name>
@@ -201,17 +210,17 @@
<entityConsumer>
<name>LinksByKnowledgeId</name>
<refreshParent v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>KnowledgeLink_entity</entityName>
- <fieldName>ByKnowledgeId</fieldName>
- </dependency>
<children>
<entityParameter>
<name>KnowledgeManagementId_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/linksbyknowledgeid/children/knowledgemanagementid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KnowledgeLink_entity</entityName>
+ <fieldName>ByKnowledgeId</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>LastChange</name>
@@ -220,17 +229,17 @@
</entityField>
<entityConsumer>
<name>LogHistories</name>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>exportHTML_action</name>
@@ -272,11 +281,6 @@
<name>KnowledgeRoles</name>
<stateProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/knowledgeroles/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/knowledgeroles/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>KnowledgeRole_entity</entityName>
- <fieldName>KnowledgeRole</fieldName>
- </dependency>
<children>
<entityParameter>
<name>KnowledgeManagement_param</name>
@@ -288,14 +292,14 @@
<expose v="true" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Tasks</name>
<dependency>
<name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
+ <entityName>KnowledgeRole_entity</entityName>
+ <fieldName>KnowledgeRole</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Tasks</name>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -310,6 +314,11 @@
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>RESPONSIBLE_CONTACT_ID</name>
@@ -327,6 +336,14 @@
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/publish/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/publish/displayValueProcess.js</displayValueProcess>
</entityField>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/KnowledgeManagement_entity/afterUiInit.js b/entity/KnowledgeManagement_entity/afterUiInit.js
new file mode 100644
index 0000000000000000000000000000000000000000..d90e107fcd4e6770480fdf4fed9b89f5b75cecb9
--- /dev/null
+++ b/entity/KnowledgeManagement_entity/afterUiInit.js
@@ -0,0 +1,11 @@
+import("system.vars");
+import("system.neon");
+
+if(vars.get("$param.ObjectRowId_param") && vars.get("$param.ObjectType_param"))
+{
+ neon.addRecord("LinksByKnowledgeId",
+ {
+ "ROW_ID": vars.get("$param.ObjectRowId_param"),
+ "OBJECT_TYPE": vars.get("$param.ObjectType_param")
+ });
+}
diff --git a/entity/KnowledgeManagement_entity/recordcontainers/db/conditionProcess.js b/entity/KnowledgeManagement_entity/recordcontainers/db/conditionProcess.js
index d73eb83fe46705ad872645c30e31657f9aea9436..1fafde255863d73379c9939c0639ac59e0039645 100644
--- a/entity/KnowledgeManagement_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/KnowledgeManagement_entity/recordcontainers/db/conditionProcess.js
@@ -23,4 +23,14 @@ if(vars.exists("$param.isDashlet_param") && vars.get("$param.isDashlet_param"))
.and("KNOWLEDGETAG.TAG", "News"), SqlBuilder.EXISTS());
}
+if(vars.get("$param.ObjectRowId_param") && vars.get("$param.ObjectType_param"))
+{
+ cond.and("KNOWLEDGEMANAGEMENT.KNOWLEDGEMANAGEMENTID",
+ newSelect("KNOWLEDGEMANAGEMENT_ID")
+ .from("KNOWLEDGELINK")
+ .where("KNOWLEDGELINK.OBJECT_TYPE", "$param.ObjectType_param")
+ .and("KNOWLEDGELINK.ROW_ID", "$param.ObjectRowId_param"),
+ SqlBuilder.IN());
+}
+
result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index efb013f5cdcba22abc918fdef8c12724361d9968..bbdfc8beb5ac717423417ba03d0ad67e8b395836 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -110,46 +110,46 @@
</entityField>
<entityConsumer>
<name>Organisations</name>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Organisations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>OrganisationType_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Productprices</name>
<dependency>
<name>dependency</name>
- <entityName>Productprice_entity</entityName>
- <fieldName>Productprices</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Organisations</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Productprices</name>
<children>
<entityParameter>
<name>ProductId_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/productprices/children/productid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Productprice_entity</entityName>
+ <fieldName>Productprices</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Stocks</name>
<selectionMode>SINGLE</selectionMode>
- <dependency>
- <name>dependency</name>
- <entityName>Stock_entity</entityName>
- <fieldName>Stocks</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ProductId_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/stocks/children/productid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Stock_entity</entityName>
+ <fieldName>Stocks</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>PICTURE</name>
@@ -158,17 +158,17 @@
<entityConsumer>
<name>StockCounts</name>
<state>READONLY</state>
- <dependency>
- <name>dependency</name>
- <entityName>Stock_entity</entityName>
- <fieldName>Stocks</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ProductId_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/stockcounts/children/productid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Stock_entity</entityName>
+ <fieldName>Stocks</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER</name>
@@ -202,11 +202,6 @@
</entityProvider>
<entityConsumer>
<name>ProductLinks</name>
- <dependency>
- <name>dependency</name>
- <entityName>Prod2prod_entity</entityName>
- <fieldName>ProductLinks</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ProductId_param</name>
@@ -215,6 +210,11 @@
<mandatory v="true" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Prod2prod_entity</entityName>
+ <fieldName>ProductLinks</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>CONTACT_ID</name>
@@ -232,11 +232,6 @@
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -247,15 +242,15 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>MainDocuments</name>
- <stateProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
- <fieldName>MainDocuments</fieldName>
+ <fieldName>Documents</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>MainDocuments</name>
+ <stateProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -266,14 +261,14 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordProductGroupcodes</name>
<dependency>
<name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
+ <entityName>Document_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordProductGroupcodes</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -281,14 +276,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordQuantityUnits</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -296,14 +291,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Activities</name>
<dependency>
<name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Activities</name>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -314,6 +309,11 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
@@ -327,11 +327,6 @@
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/Product_entity/entityfields/attributes/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -344,6 +339,11 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>ExcludedProducts_param</name>
@@ -352,6 +352,12 @@
</entityParameter>
<entityProvider>
<name>Products</name>
+ <children>
+ <entityParameter>
+ <name>ExcludedProducts_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>1b12e8ef-74ba-4294-bd2b-9d4afa80798c</name>
@@ -366,12 +372,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ExcludedProducts_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityActionField>
<name>newTask</name>
@@ -382,11 +382,6 @@
<entityConsumer>
<name>Tasks</name>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -397,15 +392,15 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/attributetree/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -416,6 +411,11 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>USER_NEW</name>
@@ -439,17 +439,17 @@
</entityField>
<entityConsumer>
<name>LogHistories</name>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>ProductText_param</name>
@@ -457,11 +457,6 @@
</entityParameter>
<entityConsumer>
<name>DescriptionTranslations</name>
- <dependency>
- <name>dependency</name>
- <entityName>DescriptionTranslation_entity</entityName>
- <fieldName>DescriptionTranslations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectRowid_param</name>
@@ -472,6 +467,11 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/descriptiontranslations/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DescriptionTranslation_entity</entityName>
+ <fieldName>DescriptionTranslations</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>openAdminView</name>
@@ -498,6 +498,24 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityConsumer>
+ <name>KnowledgeManagements</name>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/knowledgemanagements/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/knowledgemanagements/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KnowledgeManagement_entity</entityName>
+ <fieldName>Provider</fieldName>
+ </dependency>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Product_entity/entityfields/knowledgemanagements/children/objectrowid_param/valueProcess.js b/entity/Product_entity/entityfields/knowledgemanagements/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..24f19f37786781bff6661183f3fcd8ae8d1efb45
--- /dev/null
+++ b/entity/Product_entity/entityfields/knowledgemanagements/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.PRODUCTID"));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/knowledgemanagements/children/objecttype_param/valueProcess.js b/entity/Product_entity/entityfields/knowledgemanagements/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cc6924394ae950c43386275dda2c8db5d7a9c0ed
--- /dev/null
+++ b/entity/Product_entity/entityfields/knowledgemanagements/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("Context_lib");
+import("system.result");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/neonContext/Product/Product.aod b/neonContext/Product/Product.aod
index 7d36aaa10f0f067db17fc1a209b7905efb611917..4a1a49078e0a59b2fd6643f45972170c2e52f505 100644
--- a/neonContext/Product/Product.aod
+++ b/neonContext/Product/Product.aod
@@ -31,5 +31,9 @@
<name>ec872778-87d1-4070-a3da-3808da326119</name>
<view>ProductLookup_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>8088a294-78dd-4f7b-8bd3-add1b9fe3d90</name>
+ <view>ProductDescritption_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/ProductDescritption_view/ProductDescritption_view.aod b/neonView/ProductDescritption_view/ProductDescritption_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..cd46f9c47f0e84580877a9aef4117af2c737c132
--- /dev/null
+++ b/neonView/ProductDescritption_view/ProductDescritption_view.aod
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>ProductDescritption_view</name>
+ <title>Description</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>d1bc2777-ee77-4604-8d7e-735ec79ed551</name>
+ <entityField>KnowledgeManagements</entityField>
+ <view>KnowledgeManagementFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>1871fa72-d36b-43bd-937b-822ea7c2a08d</name>
+ <entityField>DescriptionTranslations</entityField>
+ <view>DescriptionTranslationFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/ProductMain_view/ProductMain_view.aod b/neonView/ProductMain_view/ProductMain_view.aod
index a0a76cf31db42a5b373709903fa7318edbecafb1..861b85ac39a6409f4ba8f423b3b844909373c7ab 100644
--- a/neonView/ProductMain_view/ProductMain_view.aod
+++ b/neonView/ProductMain_view/ProductMain_view.aod
@@ -25,9 +25,9 @@
<view>TaskFilter_view</view>
</neonViewReference>
<neonViewReference>
- <name>c647d35b-3535-4acf-b6cb-c9786a353b08</name>
- <entityField>DescriptionTranslations</entityField>
- <view>DescriptionTranslationFilter_view</view>
+ <name>7a475d46-0ce9-4fd3-ab5b-c5c625a4a3fa</name>
+ <entityField>#ENTITY</entityField>
+ <view>ProductDescritption_view</view>
</neonViewReference>
<neonViewReference>
<name>7f416115-ff89-45ca-be10-ed568cac266c</name>