diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 08affbf568cb3cbe6e3c05887afd41b5fb9da9ab..120de00f7c8fa9bcfa04cf2968cb0938e7411352 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -81,6 +81,12 @@
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>a9b81050-e7f8-408d-aa73-e2709188e121</name>
+ <entityName>SalesprojectCompetition_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
@@ -149,6 +155,11 @@
<entityField>
<name>MEMO_VALUE</name>
</entityField>
+ <entityParameter>
+ <name>filteredAttributeIds_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/possibleItemsProcess.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/possibleItemsProcess.js
index 2449074c9672b85ce7ddec1e78cfce6710a1e7fb..6f6c5532b03f7d39ee87f3c8ed4f318705ccf847 100644
--- a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/possibleItemsProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/possibleItemsProcess.js
@@ -1,5 +1,11 @@
-import("system.vars");
-import("system.result");
-import("Attribute_lib");
-
-result.object(AttributeUtil.getPossibleAttributes(vars.get("$param.objectType_param")));
+import("system.vars");
+import("system.result");
+import("Attribute_lib");
+
+var filteredAttributes = [];
+if (vars.exists("$param.filteredAttributeIds_param") && vars.get("$param.filteredAttributeIds_param"))
+{
+ filteredAttributes = JSON.parse(vars.get("$param.filteredAttributeIds_param"));
+}
+
+result.object(AttributeUtil.getPossibleAttributes(vars.get("$param.objectType_param"), undefined, filteredAttributes));
diff --git a/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js b/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
index f83ae05abaf417c8b8502955eb3a6af39a9d4f89..f48af1586cd6331e94c372f69656df270f40b9e5 100644
--- a/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
@@ -1,14 +1,23 @@
-import("system.db");
-import("system.vars");
-import("system.result");
-import("Sql_lib");
-
-if (vars.exists("$param.objectRowId_param") && vars.get("$param.objectRowId_param") != null)
-{
- cond = SqlCondition.begin()
- .andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", vars.get("$param.objectRowId_param"))
- .build();
- result.string(db.translateCondition(cond));
-}
-else
- result.string("1 = 2");
\ No newline at end of file
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Sql_lib");
+
+
+
+var cond = SqlCondition.begin()
+ .andPrepareVars("AB_ATTRIBUTERELATION.OBJECT_ROWID", "$param.objectRowId_param");
+
+if (vars.exists("$param.filteredAttributeIds_param") && vars.get("$param.filteredAttributeIds_param"))
+{
+ var filteredIds = JSON.parse(vars.get("$param.filteredAttributeIds_param"));
+ var filteredIdsCondition = new SqlCondition();
+
+ filteredIds.forEach(function(id)
+ {
+ this.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", id);
+ }, filteredIdsCondition);
+
+ cond.andSqlCondition(filteredIdsCondition);
+}
+result.string(db.translateCondition(cond.build("1=2")));
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 803af19accf6e7795a9addfc681bd3f62f9a45f6..8b81dfb0873a6a0f8d58ac888f7ff87641e709a6 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -305,24 +305,6 @@
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CART</iconId>
</entityActionField>
- <entityField>
- <name>PRICE_POLITICS</name>
- <title>Price politics</title>
- <consumer>KeywordPrice_Politics</consumer>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>STRENGTH</name>
- <title>Strength</title>
- <consumer>KeywordStrenght</consumer>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>WEAKNESS</name>
- <title>Weakness</title>
- <consumer>KeywordWeakness</consumer>
- <searchable v="false" />
- </entityField>
<entityField>
<name>STANDARD_EMAIL_COMMUNICATION</name>
<title>standard email</title>
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 9b126ea6305cdbada13b45ea087ab4a5f0850c47..0fdd5ef9d4212c2d106e47918bef84c24fa6c4df 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -99,21 +99,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityField>
- <name>ORG_PRICE_POLITICS</name>
- <title>Price politics</title>
- <consumer>KeywordPrice_Politics</consumer>
- </entityField>
- <entityField>
- <name>ORG_STRENGTH</name>
- <title>Strength</title>
- <consumer>KeywordStrenght</consumer>
- </entityField>
- <entityField>
- <name>ORG_WEAKNESS</name>
- <title>Weakness</title>
- <consumer>KeywordWeakness</consumer>
- </entityField>
<entityConsumer>
<name>Organisations</name>
<fieldType>DEPENDENCY_OUT</fieldType>
@@ -219,6 +204,30 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>Attributes</name>
+ <title>Attributes</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>RelationsForSpecificObject</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>objectType_param</name>
+ <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>objectRowId_param</name>
+ <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>filteredAttributeIds_param</name>
+ <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -279,18 +288,6 @@
<name>STATUS.value</name>
<recordfield>SALESPROJECT_COMPETITION.STATUS</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_PRICE_POLITICS.value</name>
- <recordfield>ORGANISATION.PRICE_POLITICS</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_STRENGTH.value</name>
- <recordfield>ORGANISATION.STRENGTH</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_WEAKNESS.value</name>
- <recordfield>ORGANISATION.WEAKNESS</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.displayValue</name>
<recordfield>ORGANISATION.NAME</recordfield>
@@ -303,18 +300,6 @@
<name>PHASE.value</name>
<recordfield>SALESPROJECT_COMPETITION.PHASE</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_PRICE_POLITICS.displayValue</name>
- <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_WEAKNESS.displayValue</name>
- <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_STRENGTH.displayValue</name>
- <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PHASE.displayValue</name>
<expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js</expression>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..bc93a43e52c63df889b7171cd4bc8e9ed4a3e28a
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/code.js
@@ -0,0 +1,7 @@
+import("system.result");
+
+result.object([
+ '915d566f-acbe-448c-a7b6-11898adc3880',
+ 'e73ed929-8631-46de-b28f-eb1423abb808',
+ 'f11f65d0-4352-4f81-85d0-bfd034275e34'
+]);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..ef0d5bcac51027b862291e5abd61c0c05773a8df
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e359dfbd05a73d0010c8e90a0a645160e0087e4
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Organisation");
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js
deleted file mode 100644
index d352cbd476f1f9c7225a6d4e287f254d0478fb4b..0000000000000000000000000000000000000000
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPricePolitics(), "ORGANISATION.PRICE_POLITICS");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js
deleted file mode 100644
index 0071a532b7942b287c869f4eaef13c430b057297..0000000000000000000000000000000000000000
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectStrenght(), "ORGANISATION.STRENGTH");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js
deleted file mode 100644
index 1f3ec844e7b00069d9f8bb49e3f1842402b71bdd..0000000000000000000000000000000000000000
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-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
diff --git a/neonContext/AttributeRelation/AttributeRelation.aod b/neonContext/AttributeRelation/AttributeRelation.aod
index 3d56373fb0ac8111c7d1df0efc29eee8f5c1b36f..d22d27e6d7bb6a4f4af9686983b4ebba55157301 100644
--- a/neonContext/AttributeRelation/AttributeRelation.aod
+++ b/neonContext/AttributeRelation/AttributeRelation.aod
@@ -14,5 +14,9 @@
<name>d2970ead-0da7-4fad-9f82-0c02fe85fe2c</name>
<view>AttributeRelationEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>e23b445d-12eb-400c-9153-af6b026654e6</name>
+ <view>AttributeRelationPreviewList</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index 26e9b98ce2551670cd108cf2ad6cc54f7486eed9..f6ed8390a1ccd3f99b71b5df881ca0cca5ccbc82 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -27,10 +27,6 @@
<name>68c233a5-ac5a-4aa7-b795-cd5aeb7af2e6</name>
<view>OrganisationEdit_view</view>
</neonViewReference>
- <neonViewReference>
- <name>bb592f88-fa9f-4ecc-98cc-51a7903dc970</name>
- <view>OrganisationAttr_view</view>
- </neonViewReference>
<neonViewReference>
<name>27c1cd03-506a-4e1e-a080-79b9dca6eefd</name>
<view>OrganisationLookup_view</view>
diff --git a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
new file mode 100644
index 0000000000000000000000000000000000000000..41ed1f745ebc495d92c4b4cc9c0006764e5e90de
--- /dev/null
+++ b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
@@ -0,0 +1,26 @@
+<?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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+ <name>AttributeRelationPreviewList</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>attributes</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>ca2fb22d-2987-443d-8e69-fccaba68e0c5</name>
+ <entityField>AB_ATTRIBUTE_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a4661c55-6e51-4884-b460-0ef1dca7c5f7</name>
+ <entityField>ATTRIBUTERELATION_VALUE</entityField>
+ </neonTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrganisationAttr_view/OrganisationAttr_view.aod b/neonView/OrganisationAttr_view/OrganisationAttr_view.aod
deleted file mode 100644
index 776e229c1ed02a1c41f2600c4f1928dbb5974117..0000000000000000000000000000000000000000
--- a/neonView/OrganisationAttr_view/OrganisationAttr_view.aod
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>OrganisationAttr_view</name>
- <description>TODO: View verknüpfung von generics momentan nicht möglich! Desshalb habe ich die Felder nochmal direkt verknüpft, damit es zumindest nutzbar ist.
-TODO: diese Felder werden später als Attribute implementiert</description>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>OrgAttributes</name>
- <showDrawer v="true" />
- <drawerCaption>Attributes</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>504f38a1-5642-42c5-9f43-cc20897330ec</name>
- <entityField>PRICE_POLITICS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>1c7a75d0-9032-4f63-8128-410d0c80dc0e</name>
- <entityField>STRENGTH</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>8719c99b-89bb-472d-9596-109d921a1cf2</name>
- <entityField>WEAKNESS</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
index 4d5f8da9ec87ed5acd40a327d0eeebc1769c2346..a75b6dbedd4669e0e74988874158a0b115adb5c2 100644
--- a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
+++ b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
@@ -36,25 +36,10 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
- <genericViewTemplate>
- <name>OrgAttrWorkaround_template</name>
- <showDrawer v="true" />
- <drawerCaption>Attributes</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>9cf17ad8-d91f-4445-b66c-9227bc237787</name>
- <entityField>ORG_PRICE_POLITICS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>e9d9fefd-3493-458e-b9aa-a0300de4f771</name>
- <entityField>ORG_STRENGTH</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>032e932c-038c-4a74-94e8-39e0be31fbae</name>
- <entityField>ORG_WEAKNESS</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
+ <neonViewReference>
+ <name>a0ff837d-f2f8-4e14-8246-3acdd6653be0</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationPreviewList</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
index bd4250af862bd2d962047f5de60735eb8f697795..35ae69a5e422b283ce1abecd5ad4470dabf0b756 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -90,4 +90,6 @@
<include relativeToChangelogFile="true" file="drop_contact_id_sp_forecast.xml"/>
<include relativeToChangelogFile="true" file="fix_sp_phases.xml"/>
+
+ <include relativeToChangelogFile="true" file="drop_pricePolitics-weakness-strength.xml"/>
</databaseChangeLog>
diff --git a/others/db_changes/data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml b/others/db_changes/data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml
new file mode 100644
index 0000000000000000000000000000000000000000..59d462631e8c07712b7edd59b82de439d4e6399a
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml
@@ -0,0 +1,20 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.hoermann" id="4aae69ae-85ca-4bdf-a13d-e7e6db13172c">
+ <dropColumn tableName="ORGANISATION" columnName="WEAKNESS"/>
+ <dropColumn tableName="ORGANISATION" columnName="STRENGTH"/>
+ <dropColumn tableName="ORGANISATION" columnName="PRICE_POLITICS"/>
+
+ <rollback>
+ <addColumn tableName="ORGANISATION">
+ <column name="WEAKNESS" type="CHAR(36)"/>
+ </addColumn>
+ <addColumn tableName="ORGANISATION">
+ <column name="STRENGTH" type="CHAR(36)"/>
+ </addColumn>
+ <addColumn tableName="ORGANISATION">
+ <column name="PRICE_POLITICS" type="CHAR(36)"/>
+ </addColumn>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 6648cbb580b63d43cbb9819bc1f3db67b83e52c4..9a4eb24c509030fdb5dfc1cc80fce2090bddfa34 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.translate");
import("system.neon");
import("system.vars");
@@ -18,11 +19,12 @@ function AttributeUtil () {}
* process for the attribute id in AttributeRelation
*
* @param {String} pObjectType the object type (= context)
- * @param {boolean} pIncludeGroups
+ * @param {boolean} [pIncludeGroups=false]
+ * @param {String[]} [pFilteredAttributeIds=[]] Whitleist of attribute ids
*
* @return {String[][]} two-dimensional array of attributeIds and names
*/
-AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups)
+AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFilteredAttributeIds)
{
if (pObjectType == null)
return [];
@@ -31,9 +33,21 @@ AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups)
+ " join AB_ATTRIBUTEUSAGE on AB_ATTRIBUTEID = AB_ATTRIBUTE_ID";
attrCond = SqlCondition.begin()
.andPrepare("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
- .and("ATTRIBUTE_TYPE != '" + $AttributeTypes.COMBOVALUE + "'")
+ .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# <> ?")
.and("ATTRIBUTE_ACTIVE = 1");
+ if (pFilteredAttributeIds != undefined && pFilteredAttributeIds.length > 0)
+ {
+ var filteredIdsCondition = new SqlCondition();
+
+ pFilteredAttributeIds.forEach(function(id)
+ {
+ this.orPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", id);
+ }, filteredIdsCondition);
+
+ attrCond.andSqlCondition(filteredIdsCondition);
+ }
+
if (!pIncludeGroups)
attrCond.and("ATTRIBUTE_TYPE != '" + $AttributeTypes.GROUP + "'");