diff --git a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml
index 3e4f1fbd5b8f119ecc58649bab722422cfdf571b..7153295dc12d1b84566a0af057f0f65bf706f3e9 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml
@@ -1,7 +1,17 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="b.ulrich" id="a9f53bcd-b541-4a46-bd40-a21f7fae7aba">
- <modifyDataType columnName="MEDIUM_ID" newDataType="CHAR(36)" tableName="COMMUNICATION"/>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet dbms="derby" author="b.ulrich" id="bd334096-a6ce-4739-b272-753a85ff103e">
+ <sql>
+ ALTER TABLE COMMUNICATION ADD COLUMN MEDIUM_ID_NEW CHAR(36);
+ UPDATE COMMUNICATION SET MEDIUM_ID_NEW=MEDIUM_ID;
+ ALTER TABLE COMMUNICATION DROP COLUMN MEDIUM_ID;
+ RENAME COLUMN COMMUNICATION.MEDIUM_ID_NEW TO MEDIUM_ID;
+ </sql>
</changeSet>
+
+ <changeSet dbms="!derby" author="b.ulrich" id="17c1eb73-3131-4a2b-bf9a-913590767c79">
+ <modifyDataType tableName="COMMUNICATION" columnName="MEDIUM_ID" newDataType="CHAR(36)"/>
+ </changeSet>
+
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
index 14c64bfefe06b69e868de85bdf8ab9fcd6a093c1..ec607aa9383d71b3ad3c4d1bd8b785c16d489981 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
@@ -1,7 +1,16 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="b.ulrich" id="5a0d5d3f-e849-4584-8082-481b1411d1fc">
- <modifyDataType columnName="DOCUMENTTEMPLATE_ID" newDataType="CHAR(36)" tableName="DOCUMENTTEMPLATE"/>
+ <changeSet dbms="derby" author="b.ulrich" id="83c25119-cf41-42ab-b42f-370195f9de87">
+ <sql>
+ ALTER TABLE DOCUMENTTEMPLATE ADD COLUMN DOCUMENTTEMPLATEID_NEW CHAR(36);
+ UPDATE DOCUMENTTEMPLATE SET DOCUMENTTEMPLATEID_NEW=DOCUMENTTEMPLATEID;
+ ALTER TABLE DOCUMENTTEMPLATE DROP COLUMN DOCUMENTTEMPLATEID;
+ RENAME COLUMN DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID_NEW TO DOCUMENTTEMPLATEID;
+ </sql>
+ </changeSet>
+
+ <changeSet dbms="!derby" author="b.ulrich" id="85ba6a61-9318-4118-ac4c-e33730f6581d">
+ <modifyDataType tableName="DOCUMENTTEMPLATE" columnName="DOCUMENTTEMPLATEID" newDataType="CHAR(36)"/>
</changeSet>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml
index 7de92277180d51eb97a2cb562328e8e46751b43d..237c9fd9e447f01353d895dba2a7c1123e684471 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml
@@ -1,10 +1,26 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="b.ulrich" id="77ee7dcd-cf5b-47ea-a59a-2b1230fad818">
- <modifyDataType columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)" tableName="EXPORTTEMPLATEPLACEOFUSE"/>
- <modifyDataType columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)" tableName="EXPORTTEMPLATEFIELD"/>
- <modifyDataType columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)" tableName="EXPORTTEMPLATESELECTION"/>
-
+ <changeSet dbms="derby" author="b.ulrich" id="9c551ee3-f4f0-46e4-a671-943b58c74432">
+ <sql>
+ ALTER TABLE EXPORTTEMPLATEPLACEOFUSE ADD COLUMN EXPORTTEMPLATE_ID_NEW CHAR(36);
+ UPDATE EXPORTTEMPLATEPLACEOFUSE SET EXPORTTEMPLATE_ID_NEW=EXPORTTEMPLATE_ID;
+ ALTER TABLE EXPORTTEMPLATEPLACEOFUSE DROP COLUMN EXPORTTEMPLATE_ID;
+ RENAME COLUMN EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATE_ID_NEW TO EXPORTTEMPLATE_ID;
+ ALTER TABLE EXPORTTEMPLATEFIELD ADD COLUMN EXPORTTEMPLATE_ID_NEW CHAR(36);
+ UPDATE EXPORTTEMPLATEFIELD SET EXPORTTEMPLATE_ID_NEW=EXPORTTEMPLATE_ID;
+ ALTER TABLE EXPORTTEMPLATEFIELD DROP COLUMN EXPORTTEMPLATE_ID;
+ RENAME COLUMN EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID_NEW TO EXPORTTEMPLATE_ID;
+ ALTER TABLE EXPORTTEMPLATESELECTION ADD COLUMN EXPORTTEMPLATE_ID_NEW CHAR(36);
+ UPDATE EXPORTTEMPLATESELECTION SET EXPORTTEMPLATE_ID_NEW=EXPORTTEMPLATE_ID;
+ ALTER TABLE EXPORTTEMPLATESELECTION DROP COLUMN EXPORTTEMPLATE_ID;
+ RENAME COLUMN EXPORTTEMPLATESELECTION.EXPORTTEMPLATE_ID_NEW TO EXPORTTEMPLATE_ID;
+ </sql>
+ </changeSet>
+
+ <changeSet dbms="!derby" author="b.ulrich" id="a53a2f38-3788-44a2-a151-13b3853ccb74">
+ <modifyDataType tableName="EXPORTTEMPLATEPLACEOFUSE" columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)"/>
+ <modifyDataType tableName="EXPORTTEMPLATEFIELD" columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)"/>
+ <modifyDataType tableName="EXPORTTEMPLATESELECTION" columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)"/>
</changeSet>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
index 98f643b71426d12718ef4175e9569864d3f0574b..8a20273d6173815a1334b2430ada5f6d86b2a997 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
@@ -1,7 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <include file="AlterDocumentTemplatePlaceOfUseDatatype/changelog.xml" relativeToChangelogFile="true"/>
+ <include file="AlterDatatypeOfKeyColumnsToChar/changelog.xml" relativeToChangelogFile="true"/>
<include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
- <include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 80c4686210790a754e8528e02b583a833eebcfb3..dbe878d7be0c6e3f4b7dd8c645fcb4547262337b 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -1180,12 +1180,12 @@
<name>MEDIUM_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
+ <columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<title>Medium</title>
<description></description>
<customProperties>
@@ -8237,9 +8237,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8272,10 +8272,10 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -8529,9 +8529,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8557,10 +8557,10 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -8647,9 +8647,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8696,10 +8696,10 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -8835,9 +8835,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8954,10 +8954,10 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -9267,9 +9267,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -9309,10 +9309,10 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -11573,9 +11573,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11601,10 +11601,10 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -11885,9 +11885,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11920,10 +11920,10 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -14019,12 +14019,12 @@
<name>EXPORTTEMPLATE_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
+ <columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
@@ -14345,12 +14345,12 @@
<name>EXPORTTEMPLATE_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
+ <columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
@@ -14400,12 +14400,12 @@
<name>EXPORTTEMPLATE_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
+ <columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index b9e852b3b2ae077b24a41200d051dad37e408a9a..c9855622f5a88df06c57b8c307adf3df0b6b88e7 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -4,7 +4,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation>
<contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
- <onInit>%aditoprj%/entity/AnyContact_entity/onInit.js</onInit>
+ <initFilterProcess>%aditoprj%/entity/AnyContact_entity/initFilterProcess.js</initFilterProcess>
<imageProcess>%aditoprj%/entity/AnyContact_entity/imageProcess.js</imageProcess>
<recordContainer>db</recordContainer>
<entityFields>
diff --git a/entity/AnyContact_entity/initFilterProcess.js b/entity/AnyContact_entity/initFilterProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..695577262bdb7ee4519993bcaf130262075e81ca
--- /dev/null
+++ b/entity/AnyContact_entity/initFilterProcess.js
@@ -0,0 +1,19 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var statusInactive = $KeywordRegistry.contactStatus$inactive();
+var filter = {
+ type: "group",
+ operator: "AND",
+ childs: [{
+ type: "row",
+ name: "STATUS",
+ operator: "NOT_EQUAL",
+ contenttype: "TEXT",
+ key: statusInactive,
+ value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
+ }]
+};
+
+result.string(JSON.stringify(filter));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/onInit.js b/entity/AnyContact_entity/onInit.js
deleted file mode 100644
index a75a8d405e273b1b3e026251a305676c2ccbd9ad..0000000000000000000000000000000000000000
--- a/entity/AnyContact_entity/onInit.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import("system.neon");
-import("Keyword_lib");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-var statusFilterElement = {
- "type":"row",
- "name":"STATUS",
- "operator":"NOT_EQUAL",
- "key":$KeywordRegistry.contactStatus$inactive(),
- "contenttype": "TEXT"
-};
-
-statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
-
-var filter = {
- "type":"group",
- "operator":"AND",
- "childs": [statusFilterElement]
-};
-
-filter = JSON.stringify(filter);
-neon.setFilter("#ENTITY", filter);
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js b/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
index b91c3634ae7fa3229e120ed364433b3f7787b276..04d8b224fd5596fc97753ed1afd61ad16cee5b4c 100644
--- a/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
+++ b/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
@@ -3,5 +3,5 @@ import("system.result");
import("system.vars");
//For creation of new Step in CampaignMainView
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.campaignId_param") && vars.get("$param.campaignId_param"))
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.campaignId_param") && vars.get("$param.campaignId_param") && !vars.get("$this.value"))
result.string(vars.get("$param.campaignId_param"));
\ No newline at end of file
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 82c35b3c618ecc933e74b694daa96ad9f97cbfa4..ad05310a9dd5d918ce46a6b17a4ec7564dad10ba 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -8,8 +8,8 @@
<grantUpdateProcess>%aditoprj%/entity/Contact_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/Contact_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Contact_entity/contentTitleProcess.js</contentTitleProcess>
- <onInit>%aditoprj%/entity/Contact_entity/onInit.js</onInit>
<onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
+ <initFilterProcess>%aditoprj%/entity/Contact_entity/initFilterProcess.js</initFilterProcess>
<iconId>VAADIN:USERS</iconId>
<titlePlural>Contacts</titlePlural>
<recordContainer>db</recordContainer>
diff --git a/entity/Contact_entity/initFilterProcess.js b/entity/Contact_entity/initFilterProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..695577262bdb7ee4519993bcaf130262075e81ca
--- /dev/null
+++ b/entity/Contact_entity/initFilterProcess.js
@@ -0,0 +1,19 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var statusInactive = $KeywordRegistry.contactStatus$inactive();
+var filter = {
+ type: "group",
+ operator: "AND",
+ childs: [{
+ type: "row",
+ name: "STATUS",
+ operator: "NOT_EQUAL",
+ contenttype: "TEXT",
+ key: statusInactive,
+ value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
+ }]
+};
+
+result.string(JSON.stringify(filter));
\ No newline at end of file
diff --git a/entity/Contact_entity/onInit.js b/entity/Contact_entity/onInit.js
deleted file mode 100644
index ad4324c7682881b8e9ca470e334269ae822ec522..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/onInit.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import("system.neon");
-import("Keyword_lib");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-var statusFilterElement = {
- "type":"row",
- "name":"STATUS",
- "operator":"NOT_EQUAL",
- "key":$KeywordRegistry.contactStatus$inactive(),
- "contenttype": vars.get("$property.STATUS.contentType")
-};
-
-statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
-
-var filter = {
- "type":"group",
- "operator":"AND",
- "childs": [statusFilterElement]
-};
-
-filter = JSON.stringify(filter);
-neon.setFilter("#ENTITY", filter);
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 496715ec02dabd911c89d1624a012d347396afa5..cbd7cb44ef5d77d0e3656bfe5867f3c3f68ce8f8 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -7,9 +7,9 @@
<title>Company</title>
<grantDeleteProcess>%aditoprj%/entity/Organisation_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Organisation_entity/contentTitleProcess.js</contentTitleProcess>
- <onInit>%aditoprj%/entity/Organisation_entity/onInit.js</onInit>
+ <afterUiInit>%aditoprj%/entity/Organisation_entity/afterUiInit.js</afterUiInit>
<afterOperatingState>%aditoprj%/entity/Organisation_entity/afterOperatingState.js</afterOperatingState>
- <useFavorites v="true" />
+ <initFilterProcess>%aditoprj%/entity/Organisation_entity/initFilterProcess.js</initFilterProcess>
<iconId>VAADIN:BUILDING</iconId>
<imageProcess>%aditoprj%/entity/Organisation_entity/imageProcess.js</imageProcess>
<titlePlural>Companies</titlePlural>
@@ -1104,10 +1104,6 @@
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openlocation/onActionProcess.js</onActionProcess>
<iconId>NEON:TACKED</iconId>
</entityActionField>
- <entityField>
- <name>ORGANISATION_OBJECTTYPE</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js</valueProcess>
- </entityField>
<entityField>
<name>COUNT</name>
<title>Count</title>
diff --git a/entity/Organisation_entity/afterUiInit.js b/entity/Organisation_entity/afterUiInit.js
new file mode 100644
index 0000000000000000000000000000000000000000..d529418d07b0567a96364d831a8a27194c2eca23
--- /dev/null
+++ b/entity/Organisation_entity/afterUiInit.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+import("Attribute_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
\ No newline at end of file
diff --git a/entity/Organisation_entity/initFilterProcess.js b/entity/Organisation_entity/initFilterProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..26ce7fa02bbaeaa2d25db318aa011b67278354cc
--- /dev/null
+++ b/entity/Organisation_entity/initFilterProcess.js
@@ -0,0 +1,19 @@
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("system.result");
+
+var statusInactive = $KeywordRegistry.contactStatus$inactive();
+var filter = {
+ type: "group",
+ operator: "AND",
+ childs: [{
+ type: "row",
+ name: "STATUS",
+ operator: "NOT_EQUAL",
+ contenttype: "TEXT",
+ key: statusInactive,
+ value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
+ }]
+};
+
+result.string(JSON.stringify(filter));
\ No newline at end of file
diff --git a/entity/Organisation_entity/onInit.js b/entity/Organisation_entity/onInit.js
deleted file mode 100644
index b9717583554415c62b48c4ad8304aceb87245938..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/onInit.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-import("system.neon");
-import("system.vars");
-import("Context_lib");
-import("Attribute_lib");
-
-var statusFilterElement = {
- "type":"row",
- "name":"STATUS",
- "operator":"NOT_EQUAL",
- "key":$KeywordRegistry.contactStatus$inactive(),
- "contenttype": "TEXT"
-};
-
-statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
-
-var filter = {
- "type":"group",
- "operator":"AND",
- "childs": [statusFilterElement]
-};
-
-filter = JSON.stringify(filter);
-neon.setFilter("#ENTITY", filter);
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
-}
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 5a29945dbd1241a39fdab29a88f2d18dc72e5467..907d1408a4c2c5606ddcc61e47249d015939e3e3 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -10,10 +10,10 @@
</siblings>
<grantDeleteProcess>%aditoprj%/entity/Person_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Person_entity/contentTitleProcess.js</contentTitleProcess>
- <onInit>%aditoprj%/entity/Person_entity/onInit.js</onInit>
+ <afterUiInit>%aditoprj%/entity/Person_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Person_entity/onValidation.js</onValidation>
<afterOperatingState>%aditoprj%/entity/Person_entity/afterOperatingState.js</afterOperatingState>
- <useFavorites v="true" />
+ <initFilterProcess>%aditoprj%/entity/Person_entity/initFilterProcess.js</initFilterProcess>
<iconId>VAADIN:USERS</iconId>
<imageProcess>%aditoprj%/entity/Person_entity/imageProcess.js</imageProcess>
<usePermissions v="false" />
@@ -1267,10 +1267,6 @@
</entityParameter>
</children>
</entityProvider>
- <entityField>
- <name>PERSON_OBJECTTYPE</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/person_objecttype/valueProcess.js</valueProcess>
- </entityField>
<entityField>
<name>COUNT</name>
<title>Count</title>
diff --git a/entity/Person_entity/afterUiInit.js b/entity/Person_entity/afterUiInit.js
new file mode 100644
index 0000000000000000000000000000000000000000..d529418d07b0567a96364d831a8a27194c2eca23
--- /dev/null
+++ b/entity/Person_entity/afterUiInit.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+import("Attribute_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
\ No newline at end of file
diff --git a/entity/Person_entity/initFilterProcess.js b/entity/Person_entity/initFilterProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..26ce7fa02bbaeaa2d25db318aa011b67278354cc
--- /dev/null
+++ b/entity/Person_entity/initFilterProcess.js
@@ -0,0 +1,19 @@
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("system.result");
+
+var statusInactive = $KeywordRegistry.contactStatus$inactive();
+var filter = {
+ type: "group",
+ operator: "AND",
+ childs: [{
+ type: "row",
+ name: "STATUS",
+ operator: "NOT_EQUAL",
+ contenttype: "TEXT",
+ key: statusInactive,
+ value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
+ }]
+};
+
+result.string(JSON.stringify(filter));
\ No newline at end of file
diff --git a/entity/Person_entity/onInit.js b/entity/Person_entity/onInit.js
deleted file mode 100644
index 1958e327f289481afe51088aa62d5d57af3a782f..0000000000000000000000000000000000000000
--- a/entity/Person_entity/onInit.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-import("system.neon");
-import("system.vars");
-import("Context_lib");
-import("Attribute_lib");
-
-var statusFilterElement = {
- "type":"row",
- "name":"STATUS",
- "operator":"NOT_EQUAL",
- "key":$KeywordRegistry.contactStatus$inactive(),
- "contenttype": "TEXT"
-};
-
-statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
-
-var filter = {
- "type":"group",
- "operator":"AND",
- "childs": [statusFilterElement]
-};
-
-filter = JSON.stringify(filter);
-neon.setFilter("#ENTITY", filter);
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
-}
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 14cdb18785867088dbb7220fa1bb33afc7b479a3..64f381e93f98b991c2c8502acfc95780050d98c6 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -6,8 +6,9 @@
<title>Task</title>
<grantDeleteProcess>%aditoprj%/entity/Task_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Task_entity/contentTitleProcess.js</contentTitleProcess>
- <onInit>%aditoprj%/entity/Task_entity/onInit.js</onInit>
+ <afterUiInit>%aditoprj%/entity/Task_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Task_entity/onValidation.js</onValidation>
+ <initFilterProcess>%aditoprj%/entity/Task_entity/initFilterProcess.js</initFilterProcess>
<iconId>VAADIN:TASKS</iconId>
<iconIdProcess>%aditoprj%/entity/Task_entity/iconIdProcess.js</iconIdProcess>
<titlePlural>Tasks</titlePlural>
diff --git a/entity/Task_entity/afterUiInit.js b/entity/Task_entity/afterUiInit.js
new file mode 100644
index 0000000000000000000000000000000000000000..2f108ba446930b67156ba07b5e880b1ff371117a
--- /dev/null
+++ b/entity/Task_entity/afterUiInit.js
@@ -0,0 +1,6 @@
+import("system.neon");
+import("system.vars");
+import("ActivityTask_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.PARENT_CONTEXT", "$field.PARENT_ID");
\ No newline at end of file
diff --git a/entity/Task_entity/initFilterProcess.js b/entity/Task_entity/initFilterProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..39b6e0b2e29be0e89c1cf8279ab9c9ae93a74ab9
--- /dev/null
+++ b/entity/Task_entity/initFilterProcess.js
@@ -0,0 +1,19 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var statusEnded = $KeywordRegistry.taskStatus$ended();
+var filter = {
+ type: "group",
+ operator: "AND",
+ childs: [{
+ type: "row",
+ name: "STATUS",
+ operator: "NOT_EQUAL",
+ contenttype: "TEXT",
+ key: statusEnded,
+ value: KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), statusEnded)
+ }]
+};
+
+result.string(JSON.stringify(filter));
\ No newline at end of file
diff --git a/entity/Task_entity/onInit.js b/entity/Task_entity/onInit.js
deleted file mode 100644
index 0a610862cbb9ecae7e44e15eabbc31b0b20eceda..0000000000000000000000000000000000000000
--- a/entity/Task_entity/onInit.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.neon");
-import("ActivityTask_lib");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var recordState = vars.get("$sys.recordstate");
-if(recordState == neon.OPERATINGSTATE_NEW)
-{
- TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.PARENT_CONTEXT", "$field.PARENT_ID");
-}
-else if (recordState != neon.OPERATINGSTATE_SEARCH)
-{
- var statusFilterElement = {
- "type":"row",
- "name":"STATUS",
- "operator":"NOT_EQUAL",
- "key":$KeywordRegistry.taskStatus$ended(),
- "contenttype": "TEXT"
- };
- statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), statusFilterElement.key);
-
- var filter = {
- "type":"group",
- "operator":"AND",
- "childs": [statusFilterElement]
- };
- filter = JSON.stringify(filter);
- neon.setFilter("#ENTITY", filter);
-}
\ No newline at end of file
diff --git a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
index e6b791a1555b6a62e8aa30645115c036281ffffb..4bfb7356f1f86c2afd0227d9931f1b4563acffe2 100644
--- a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
+++ b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
@@ -7,7 +7,6 @@
<grantCreateProcess>%aditoprj%/entity/WorkflowDefinition_entity/grantCreateProcess.js</grantCreateProcess>
<grantDelete v="false" />
<contentTitleProcess>%aditoprj%/entity/WorkflowDefinition_entity/contentTitleProcess.js</contentTitleProcess>
- <onInit>%aditoprj%/entity/WorkflowDefinition_entity/onInit.js</onInit>
<useFavorites v="true" />
<iconId>VAADIN:DROP</iconId>
<titlePlural>Workflow definitions</titlePlural>
diff --git a/entity/WorkflowDefinition_entity/onInit.js b/entity/WorkflowDefinition_entity/onInit.js
deleted file mode 100644
index 7199fd35b05e991cb7f35e577f1a7e593a28c60e..0000000000000000000000000000000000000000
--- a/entity/WorkflowDefinition_entity/onInit.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.translate");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
-{
- var filterOnlyUnfinished = {
- type : "group",
- operator : "AND",
- childs : [{
- type : "row",
- name : "ISFINISHED",
- operator : "EQUAL",
- value : translate.text("No"),
- key : "false",
- contenttype : "BOOLEAN"
- }]
- };
- neon.setFilter("Instances", JSON.stringify(filterOnlyUnfinished));
-}
\ No newline at end of file
diff --git a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod b/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
index 37c5a337ba3fef1c5b2d8e9c3574bbea5404ef21..765793b9f379e0c813bca3b508491cf0dcba0421 100644
--- a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
+++ b/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
@@ -5,6 +5,7 @@
<documentation>%aditoprj%/entity/WorkflowInstance_entity/documentation.adoc</documentation>
<title>Workflow instance</title>
<contentTitleProcess>%aditoprj%/entity/WorkflowInstance_entity/contentTitleProcess.js</contentTitleProcess>
+ <initFilterProcess>%aditoprj%/entity/WorkflowInstance_entity/initFilterProcess.js</initFilterProcess>
<titlePlural>Workflow instances</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
diff --git a/entity/WorkflowInstance_entity/initFilterProcess.js b/entity/WorkflowInstance_entity/initFilterProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..80a38560e27c2236fec97c140cbce55462a7c809
--- /dev/null
+++ b/entity/WorkflowInstance_entity/initFilterProcess.js
@@ -0,0 +1,17 @@
+import("system.result");
+import("system.translate");
+
+var filterOnlyUnfinished = {
+ type : "group",
+ operator : "AND",
+ childs : [{
+ type : "row",
+ name : "ISFINISHED",
+ operator : "EQUAL",
+ value : translate.text("No"),
+ key : "false",
+ contenttype : "BOOLEAN"
+ }]
+};
+
+result.string(JSON.stringify(filterOnlyUnfinished));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index ed12fc0f39983f65d9e03fa38e9411b86427147a..42409fc7a7206d17e71a75a697b5e057b54e8b27 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6807,49 +6807,64 @@
<key>Settings</key>
</entry>
<entry>
- <key>workflow notification</key>
+ <key>No new recipients found that can be added to the bulk mail.</key>
</entry>
<entry>
- <key>Permission received</key>
+ <key>Add Recipients</key>
</entry>
<entry>
- <key>leadimport notification</key>
+ <key>Add Participants</key>
</entry>
<entry>
- <key>granted permission</key>
+ <key>Download letter and create Activity</key>
</entry>
<entry>
- <key>bulk mail sent</key>
+ <key>and open Report</key>
</entry>
<entry>
- <key>download ready</key>
+ <key>export</key>
</entry>
<entry>
- <key>No new recipients found that can be added to the bulk mail.</key>
+ <key>export using the selected template</key>
</entry>
<entry>
- <key>Add Recipients</key>
+ <key>No new recipients found that can be added to the serial letter.</key>
</entry>
<entry>
- <key>Add Participants</key>
+ <key>send mail</key>
</entry>
<entry>
- <key>Download letter and create Activity</key>
+ <key>and open modeler</key>
</entry>
<entry>
- <key>and open Report</key>
+ <key>Create model</key>
</entry>
<entry>
- <key>export</key>
+ <key>Edit workflow</key>
</entry>
<entry>
- <key>export using the selected template</key>
+ <key>Receive new Department Permission</key>
</entry>
<entry>
- <key>No new recipients found that can be added to the serial letter.</key>
+ <key>Receive new User Permission</key>
</entry>
<entry>
- <key>send mail</key>
+ <key>workflow notification</key>
+ </entry>
+ <entry>
+ <key>Permission received</key>
+ </entry>
+ <entry>
+ <key>leadimport notification</key>
+ </entry>
+ <entry>
+ <key>granted permission</key>
+ </entry>
+ <entry>
+ <key>bulk mail sent</key>
+ </entry>
+ <entry>
+ <key>download ready</key>
</entry>
<entry>
<key>Add new Department Permission</key>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index a4c956a47885f4d1a8c17b2e4c016cc676c2df32..04af5e1dd1baffca319dfe48bee1e53aa44effb6 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8187,6 +8187,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Send email</key>
+ <value>E-Mail losschicken</value>
</entry>
<entry>
<key>Activites</key>
@@ -8578,6 +8579,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Zip</key>
+ <value>PLZ</value>
</entry>
<entry>
<key>type</key>
@@ -8734,51 +8736,63 @@ Bitte Datumseingabe prüfen</value>
<value>gültig ab (in </value>
</entry>
<entry>
- <key>workflow notification</key>
+ <key>No new recipients found that can be added to the bulk mail.</key>
+ <value>Keine neuen Empfänger, die zur Serienmail hinzugefügt werden können, gefunden.</value>
</entry>
<entry>
- <key>Permission received</key>
- <value>erhaltene Berechtigung</value>
+ <key>Add Recipients</key>
+ <value>Empfänger hinzufügen</value>
</entry>
<entry>
- <key>leadimport notification</key>
+ <key>Add Participants</key>
+ <value>Teilnehmer hinzufügen</value>
</entry>
<entry>
- <key>granted permission</key>
- <value>vergebene Berechtigung</value>
+ <key>Download letter and create Activity</key>
+ <value>Brief herunterladen und Aktivität erstellen</value>
</entry>
<entry>
- <key>bulk mail sent</key>
+ <key>and open Report</key>
+ <value>und Report öffnen</value>
</entry>
<entry>
- <key>download ready</key>
+ <key>export</key>
+ </entry>
+ <entry>
+ <key>export using the selected template</key>
+ <value>Mit der ausgewählten Vorlage Exportieren</value>
+ </entry>
+ <entry>
+ <key>No new recipients found that can be added to the serial letter.</key>
+ <value>Keine neuen Empfänger, die zum Serienbrief werden können, gefunden.</value>
+ </entry>
+ <entry>
+ <key>send mail</key>
+ <value>E-Mail losschicken</value>
</entry>
<entry>
<key>Receive new Department Permission</key>
- <value>Neue Abteilungs-Berechtigung erhalten</value>
</entry>
<entry>
<key>Receive new User Permission</key>
- <value>Neue Benutzer-Berechtigung erhalten</value>
</entry>
<entry>
- <key>export</key>
+ <key>workflow notification</key>
</entry>
<entry>
- <key>No new recipients found that can be added to the serial letter.</key>
- <value>Keine neuen Empfänger, die zum Serienbrief werden können, gefunden.</value>
+ <key>Permission received</key>
</entry>
<entry>
- <key>No new recipients found that can be added to the bulk mail.</key>
- <value>Keine neuen Empfänger, die zur Serienmail hinzugefügt werden können, gefunden.</value>
+ <key>leadimport notification</key>
</entry>
<entry>
- <key>export using the selected template</key>
- <value>Mit der ausgewählten Vorlage Exportieren</value>
+ <key>granted permission</key>
</entry>
<entry>
- <key>send mail</key>
- <value>E-Mail losschicken</value>
+ <key>bulk mail sent</key>
+ </entry>
+ <entry>
+ <key>download ready</key>
</entry>
<entry>
<key>Download letter and create Activity</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index f795919fd82d323b6293b5b6ada7effe00920d07..831943f96a2daf3227add9b100e904dda275b764 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6873,55 +6873,64 @@
<key>Settings</key>
</entry>
<entry>
- <key>workflow notification</key>
+ <key>No new recipients found that can be added to the bulk mail.</key>
</entry>
<entry>
- <key>Permission received</key>
+ <key>Add Recipients</key>
</entry>
<entry>
- <key>leadimport notification</key>
+ <key>Add Participants</key>
</entry>
<entry>
- <key>granted permission</key>
+ <key>Download letter and create Activity</key>
</entry>
<entry>
- <key>bulk mail sent</key>
+ <key>and open Report</key>
</entry>
<entry>
- <key>download ready</key>
+ <key>export</key>
</entry>
<entry>
- <key>No new recipients found that can be added to the bulk mail.</key>
+ <key>export using the selected template</key>
</entry>
<entry>
- <key>Add Recipients</key>
+ <key>No new recipients found that can be added to the serial letter.</key>
</entry>
<entry>
- <key>Add Participants</key>
+ <key>send mail</key>
</entry>
<entry>
- <key>Download letter and create Activity</key>
+ <key>Receive new Department Permission</key>
</entry>
<entry>
- <key>and open Report</key>
+ <key>Receive new User Permission</key>
</entry>
<entry>
- <key>export</key>
+ <key>and open modeler</key>
</entry>
<entry>
- <key>export using the selected template</key>
+ <key>Create model</key>
</entry>
<entry>
- <key>No new recipients found that can be added to the serial letter.</key>
+ <key>Edit workflow</key>
</entry>
<entry>
- <key>send mail</key>
+ <key>workflow notification</key>
</entry>
<entry>
- <key>Receive new Department Permission</key>
+ <key>Permission received</key>
</entry>
<entry>
- <key>Receive new User Permission</key>
+ <key>leadimport notification</key>
+ </entry>
+ <entry>
+ <key>granted permission</key>
+ </entry>
+ <entry>
+ <key>bulk mail sent</key>
+ </entry>
+ <entry>
+ <key>download ready</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/process/AttributeFilter_lib/process.js b/process/AttributeFilter_lib/process.js
index f64477390ffc247d5e6fd9768f2840dae133c1e1..81a5208ba9200da0a4296046c55485446b2f78a5 100644
--- a/process/AttributeFilter_lib/process.js
+++ b/process/AttributeFilter_lib/process.js
@@ -155,7 +155,7 @@ AttributeFilterExtensionMaker.getFilterValues = function(pFilter)
var attrType = name.type;
if (attrType == $AttributeTypes.VOID.toString())
attrType = $AttributeTypes.BOOLEAN.toString();
- var res = AttributeUtil.getPossibleListValues(attributeId, attrType);
+ var res = AttributeUtil.getPossibleListValues(attributeId, attrType, true);
if (res == null)
res = [];
return res;
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 40eed67b874f583649eda1b1369df0ea870e9921..9fd2230221263fd1de7423ef86b50dd8fbdfe473 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -148,7 +148,7 @@ AttributeUtil.getPossibleListValues = function (pAttributeId, pAttributeType, pI
{
var attributeId = pAttributeId;
var attrType = pAttributeType.trim();
- var onlyActives = (pIncludeInactives == undefined ? false : pIncludeInactives);
+ var onlyActives = !pIncludeInactives;
if (attrType == $AttributeTypes.COMBO.toString())
{
var valuesSelect = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_NAME")