Skip to content
Snippets Groups Projects
Commit d2a593b1 authored by Benjamin Ulrich's avatar Benjamin Ulrich :speech_balloon: Committed by Sebastian Listl
Browse files

[Projekt: Entwicklung - Neon][TicketNr.: 1054174][Fehler in FilterExtension für Attributes]

parent 49125f36
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 134 additions and 1 deletion
entity/AttributeRelation_entity/AttributeRelation_entity.aod
+ 35
− 0
View file @ d2a593b1
......@@ -346,6 +346,41 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
<entityConsumer>
<name>SpecificFilterAttributes</name>
<dependency>
<name>dependency</name>
<entityName>Attribute_entity</entityName>
<fieldName>SpecificFilterAttributes</fieldName>
</dependency>
<children>
<entityParameter>
<name>AttributeCount_param</name>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificfilterattributes/children/attributecount_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificfilterattributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityProvider>
<name>FilterProvider</name>
<dependencies>
<entityDependency>
<name>0560c6d0-8473-4050-9ca1-a935bbac2ef9</name>
<entityName>Organisation_entity</entityName>
<fieldName>AttributesFilter</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>DisplaySimpleName_param</name>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/filterprovider/children/displaysimplename_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
......
entity/AttributeRelation_entity/entityfields/filterprovider/children/displaysimplename_param/valueProcess.js 0 → 100644
+ 3
− 0
View file @ d2a593b1
import("system.result");
result.string(false);
\ No newline at end of file
entity/AttributeRelation_entity/entityfields/specificfilterattributes/children/attributecount_param/valueProcess.js 0 → 100644
+ 8
− 0
View file @ d2a593b1
import("Attribute_lib");
import("system.result");
import("system.vars");
var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
var rowId = vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param");
if (vars.get("$param.GetTree_param") == "true" && rowId)
result.object(AttributeRelationUtils.countAttributeRelations(rowId, objectType));
\ No newline at end of file
entity/AttributeRelation_entity/entityfields/specificfilterattributes/children/objecttype_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ d2a593b1
import("system.vars");
import("system.result");
result.string(vars.exists("$param.ObjectType_param") ? vars.get("$param.ObjectType_param") : "");
entity/Attribute_entity/Attribute_entity.aod
+ 21
− 0
View file @ d2a593b1
......@@ -485,6 +485,27 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
<entityProvider>
<name>SpecificFilterAttributes</name>
<dependencies>
<entityDependency>
<name>9b2b5f2e-229d-4a10-a54f-cbf77aafe512</name>
<entityName>AttributeRelation_entity</entityName>
<fieldName>SpecificFilterAttributes</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>DisplaySimpleName_param</name>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/specificfilterattributes/children/displaysimplename_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ChildType_param</name>
<expose v="false" />
</entityParameter>
</children>
</entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
......
entity/Attribute_entity/entityfields/specificfilterattributes/children/displaysimplename_param/valueProcess.js 0 → 100644
+ 3
− 0
View file @ d2a593b1
import("system.result");
result.string(false);
\ No newline at end of file
entity/Organisation_entity/Organisation_entity.aod
+ 21
− 0
View file @ d2a593b1
......@@ -1074,6 +1074,7 @@
</entityActionGroup>
<entityField>
<name>STANDARD_COUNTRY</name>
<title>Standard Country</title>
<groupable v="true" />
</entityField>
<entityParameter>
......@@ -1139,10 +1140,12 @@
</entityField>
<entityField>
<name>STANDARD_ZIP</name>
<title>Standard Zip</title>
<groupable v="true" />
</entityField>
<entityField>
<name>STANDARD_CITY</name>
<title>Standard City</title>
<groupable v="true" />
</entityField>
<entityField>
......@@ -1397,6 +1400,24 @@
</entityActionField>
</children>
</entityActionGroup>
<entityConsumer>
<name>AttributesFilter</name>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
<fieldName>FilterProvider</fieldName>
</dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributesfilter/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributesfilter/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/Organisation_entity/entityfields/attributesfilter/children/objectrowid_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ d2a593b1
import("system.vars");
import("system.result");
result.string(vars.get("$field.CONTACTID"));//TODO: CONTACTID/ORGANISATIONID: review if this should be the CONTACTID or the ORGANISATIONID
\ No newline at end of file
entity/Organisation_entity/entityfields/attributesfilter/children/objecttype_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ d2a593b1
import("system.vars");
import("system.result");
result.string(vars.get("$field.CONTACTID"));//TODO: CONTACTID/ORGANISATIONID: review if this should be the CONTACTID or the ORGANISATIONID
\ No newline at end of file
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 9
− 0
View file @ d2a593b1
......@@ -7284,6 +7284,15 @@
<entry>
<key>Probability in %</key>
</entry>
<entry>
<key>Standard City</key>
</entry>
<entry>
<key>Standard Country</key>
</entry>
<entry>
<key>Standard Zip</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
......
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 12
− 0
View file @ d2a593b1
......@@ -9662,6 +9662,18 @@ Bitte Datumseingabe prüfen</value>
<key>Probability in %</key>
<value>Wahrscheinlichkeit in %</value>
</entry>
<entry>
<key>Standard City</key>
<value>Standardstadt</value>
</entry>
<entry>
<key>Standard Country</key>
<value>Standartland</value>
</entry>
<entry>
<key>Standard Zip</key>
<value>Standart Plz</value>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+ 9
− 0
View file @ d2a593b1
......@@ -7365,6 +7365,15 @@
<entry>
<key>Probability in %</key>
</entry>
<entry>
<key>Standard City</key>
</entry>
<entry>
<key>Standard Country</key>
</entry>
<entry>
<key>Standard Zip</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
process/AttributeFilter_lib/process.js
+ 1
− 1
View file @ d2a593b1
......@@ -89,7 +89,7 @@ AttributeFilterExtensionMaker.getFilterFields = function(pObjectType)
var res = [];
var loadingConfig = entities.createConfigForLoadingRows().entity("Attribute_entity")
.provider("SpecificAttribute")
.provider("SpecificFilterAttributes")
.fields(["UID", "FULL_ATTRIBUTE_NAME", "ATTRIBUTE_TYPE"])
.addParameter("ObjectType_param", pObjectType);
......
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