diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod index a6986857385974ed4be09d1609394f2c4035aa28..abb40846551f37d8ec2a458a09e19b55276b0656 100644 --- a/entity/ObjectTree_entity/ObjectTree_entity.aod +++ b/entity/ObjectTree_entity/ObjectTree_entity.aod @@ -48,25 +48,31 @@ </entityParameter> <entityField> <name>UID</name> + <searchable v="false" /> </entityField> <entityField> <name>PARENT_ID</name> + <searchable v="false" /> </entityField> <entityField> <name>TITLE</name> + <searchable v="false" /> </entityField> <entityField> <name>ICON</name> + <searchable v="false" /> <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/icon/valueProcess.js</valueProcess> </entityField> <entityField> <name>DESCRIPTION</name> + <searchable v="false" /> <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/description/valueProcess.js</valueProcess> </entityField> <entityField> <name>Selector</name> <title>Relationtype</title> <consumer>ObjectRelationTypes</consumer> + <searchable v="true" /> <state>EDITABLE</state> <onValueChange>%aditoprj%/entity/ObjectTree_entity/entityfields/selector/onValueChange.js</onValueChange> </entityField> @@ -93,15 +99,19 @@ </entityParameter> <entityField> <name>EXPANDED</name> + <searchable v="false" /> </entityField> <entityField> <name>NODEID</name> + <searchable v="false" /> </entityField> <entityField> <name>TARGET_ID</name> + <searchable v="false" /> </entityField> <entityField> <name>TARGET_CONTEXT</name> + <searchable v="false" /> </entityField> </entityFields> <recordContainers> @@ -116,6 +126,7 @@ <element>EXPANDED.value</element> <element>TARGET_ID.value</element> <element>TARGET_CONTEXT.value</element> + <element>Selector.value</element> </recordFields> </jDitoRecordContainer> </recordContainers> diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js index 824c27dc86b98d4d72b14a4c258a89f46c0dc921..a167caa248c88d0c86b1fc963b13b8fc532fcacd 100644 --- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js +++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js @@ -11,9 +11,18 @@ import("Sql_lib"); var relationTypesCache = {}; var tree = [] +var filter = JSON.parse(vars.get("$local.filter")) +var selectedRelationType = null; -_loadObjectRelationTree(vars.get("$param.ObjectId_param"), vars.get("$param.ObjectType_param"), vars.get("$field.Selector")); +if (filter) +{ + if (filter.childs.length > 0) + { + selectedRelationType = filter.childs[0].value; + } +} +_loadObjectRelationTree(vars.get("$param.ObjectId_param"), vars.get("$param.ObjectType_param"), selectedRelationType); result.object(tree); function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer) @@ -62,7 +71,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, // TODO: Icons, BINDATA // var icon = getIcon... let uid = [currentObjectId, i, relationTypes[i]]; - tree.push([JSON.stringify(uid), translate.text(relationTypes[i][1]), JSON.stringify(pNodeId), true, null, null]); + tree.push([JSON.stringify(uid), translate.text(relationTypes[i][1]), JSON.stringify(pNodeId), true, null, null, ""]); _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, uid, pLayer+1); } @@ -174,7 +183,7 @@ function _insertEntry (pTree, pEntryData, pNodeId, pLayer, pObjectType, pRelatio // TODO: Icon var uid = [pEntryData[i][0], i, pRelationTypeData, pObjectType, pNodeId, pEntryData[i][2]] uids.push(uid); - pTree.push([JSON.stringify(uid), display, JSON.stringify(pNodeId), expanded, pEntryData[i][0], pObjectType]); + pTree.push([JSON.stringify(uid), display, JSON.stringify(pNodeId), expanded, pEntryData[i][0], pObjectType, ""]); } return uids; } diff --git a/neonView/ObjectTree_view/ObjectTree_view.aod b/neonView/ObjectTree_view/ObjectTree_view.aod index ca08618677554b9dd8d3413412a138f17dd1344a..a6e80e32a7f2926a5b5fe483e17b06818c750df3 100644 --- a/neonView/ObjectTree_view/ObjectTree_view.aod +++ b/neonView/ObjectTree_view/ObjectTree_view.aod @@ -2,23 +2,13 @@ <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1"> <name>ObjectTree_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> + <filterable v="true" /> <layout> <boxLayout> <name>layout</name> </boxLayout> </layout> <children> - <genericViewTemplate> - <name>Selector</name> - <editMode v="true" /> - <entityField>#ENTITY</entityField> - <fields> - <entityFieldLink> - <name>50eef5d6-418b-411b-a585-8633119b2fb0</name> - <entityField>Selector</entityField> - </entityFieldLink> - </fields> - </genericViewTemplate> <treeViewTemplate> <name>ObjectRelations</name> <parentField>PARENT_ID</parentField>