Skip to content
Snippets Groups Projects
Commit 453da44b authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

some Fixes

parent 19c317c2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 105 additions and 62 deletions
entity/Attribute_entity/Attribute_entity.aod
+ 4
− 0
View file @ 453da44b
......@@ -325,6 +325,10 @@
<element>ATTRIBUTE_NAME</element>
</fields>
</entityFieldGroup>
<entityField>
<name>expanded</name>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/expanded/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
......
entity/Attribute_entity/entityfields/expanded/valueProcess.js 0 → 100644
+ 3
− 0
View file @ 453da44b
import("system.result");
result.object(false);
\ No newline at end of file
entity/KeywordEntry_entity/KeywordEntry_entity.aod
+ 4
− 0
View file @ 453da44b
......@@ -488,6 +488,10 @@
<expose v="true" />
<documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/whitelistids_param/documentation.adoc</documentation>
</entityParameter>
<entityField>
<name>expanded</name>
<valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/expanded/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/KeywordEntry_entity/entityfields/expanded/valueProcess.js 0 → 100644
+ 3
− 0
View file @ 453da44b
import("system.result");
result.object(false);
\ No newline at end of file
entity/Offer_entity/Offer_entity.aod
+ 1
− 0
View file @ 453da44b
......@@ -650,6 +650,7 @@
<mandatoryProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/mandatoryProcess.js</mandatoryProcess>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
</entityField>
......
entity/Offer_entity/entityfields/object_rowid/titleProcess.js 0 → 100644
+ 21
− 0
View file @ 453da44b
import("system.translate");
import("system.result");
import("system.vars");
import("Context_lib");
var possibleTypes = vars.getString("$param.PossibleConnectionTypes");
var title = translate.text("Link");
if (possibleTypes)
{
possibleTypes = JSON.parse(possibleTypes);
if (possibleTypes.length == 1)
{
var contextTitle = ContextUtils.getTitle(possibleTypes[0]);
if (contextTitle)
title = contextTitle;
}
}
result.string(title);
\ No newline at end of file
neonView/AttributeFilter_view/AttributeFilter_view.aod
+ 63
− 62
View file @ 453da44b
<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AttributeFilter_view</name>
<title>Attributes</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
<groupLayout>
<name>layout</name>
</groupLayout>
</layout>
<children>
<treeTableViewTemplate>
<name>AttributeTreeTable</name>
<parentField>ATTRIBUTE_PARENT_ID</parentField>
<favoriteActionGroup1>AttributeActions</favoriteActionGroup1>
<showChildrenCount v="false" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
<name>169aceb2-2ff8-42de-ab89-4d3cc15d5747</name>
<entityField>ICON</entityField>
<width v="75" />
</neonTableColumn>
<neonTableColumn>
<name>a776a053-6712-44f9-943f-da26d1ce11ee</name>
<entityField>ATTRIBUTE_NAME</entityField>
</neonTableColumn>
<neonTableColumn>
<name>b975154d-8bac-4182-9030-e3b3d744c642</name>
<entityField>ATTRIBUTE_TYPE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>ad92d325-6cdb-4fa0-a99b-27c937c89936</name>
<entityField>USAGELIST</entityField>
</neonTableColumn>
</columns>
</treeTableViewTemplate>
<tableViewTemplate>
<name>AttributesTable</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
<name>c1ee431e-e4d2-4744-ad8c-2bf2c2eed8d6</name>
<entityField>ICON</entityField>
</neonTableColumn>
<neonTableColumn>
<name>4dae1a23-8798-42ff-998c-7f5fedc7dcc5</name>
<entityField>FULL_ATTRIBUTE_NAME</entityField>
</neonTableColumn>
<neonTableColumn>
<name>ed7598ea-c29c-4d04-9b28-27ee3b28a5b1</name>
<entityField>ATTRIBUTE_TYPE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>cc88ea53-2673-4c6e-ac2e-6766d2698453</name>
<entityField>USAGELIST</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
</children>
</neonView>
<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AttributeFilter_view</name>
<title>Attributes</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
<groupLayout>
<name>layout</name>
</groupLayout>
</layout>
<children>
<treeTableViewTemplate>
<name>AttributeTreeTable</name>
<parentField>ATTRIBUTE_PARENT_ID</parentField>
<favoriteActionGroup1>AttributeActions</favoriteActionGroup1>
<nodeExpandedField>expanded</nodeExpandedField>
<showChildrenCount v="false" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
<name>169aceb2-2ff8-42de-ab89-4d3cc15d5747</name>
<entityField>ICON</entityField>
<width v="75" />
</neonTableColumn>
<neonTableColumn>
<name>a776a053-6712-44f9-943f-da26d1ce11ee</name>
<entityField>ATTRIBUTE_NAME</entityField>
</neonTableColumn>
<neonTableColumn>
<name>b975154d-8bac-4182-9030-e3b3d744c642</name>
<entityField>ATTRIBUTE_TYPE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>ad92d325-6cdb-4fa0-a99b-27c937c89936</name>
<entityField>USAGELIST</entityField>
</neonTableColumn>
</columns>
</treeTableViewTemplate>
<tableViewTemplate>
<name>AttributesTable</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
<name>c1ee431e-e4d2-4744-ad8c-2bf2c2eed8d6</name>
<entityField>ICON</entityField>
</neonTableColumn>
<neonTableColumn>
<name>4dae1a23-8798-42ff-998c-7f5fedc7dcc5</name>
<entityField>FULL_ATTRIBUTE_NAME</entityField>
</neonTableColumn>
<neonTableColumn>
<name>ed7598ea-c29c-4d04-9b28-27ee3b28a5b1</name>
<entityField>ATTRIBUTE_TYPE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>cc88ea53-2673-4c6e-ac2e-6766d2698453</name>
<entityField>USAGELIST</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
</children>
</neonView>
neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
+ 1
− 0
View file @ 453da44b
......@@ -11,6 +11,7 @@
<children>
<treeTableViewTemplate>
<name>EntriesTreeTable</name>
<nodeExpandedField>expanded</nodeExpandedField>
<defaultGroupFields>
<element>CONTAINER</element>
</defaultGroupFields>
......
process/Context_lib/process.js
+ 5
− 0
View file @ 453da44b
......@@ -29,6 +29,11 @@ ContextUtils.getCurrentContextId = function()
return vars.getString("$sys.currentcontextname");
}
ContextUtils.getTitle = function(pContextId)
{
return project.getDataModel(project.DATAMODEL_KIND_CONTEXT, pContextId)[1];
}
/**
* TODO: use System function. Currently the Name is also the id.
* Returns the Name of a context by the Id
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment