Skip to content
Snippets Groups Projects
Commit 464d102f authored by S.Listl's avatar S.Listl
Browse files

merged origin/2020.1 into master

parents fc6bb429 4861a4b0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 200 additions and 190 deletions
.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml
+ 13
− 3
View file @ 464d102f
<?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>
.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
+ 11
− 2
View file @ 464d102f
<?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>
.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml
+ 21
− 5
View file @ 464d102f
<?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>
.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+ 1
− 2
View file @ 464d102f
<?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>
aliasDefinition/Data_alias/Data_alias.aod
+ 57
− 57
View file @ 464d102f
......@@ -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>
......
entity/AnyContact_entity/AnyContact_entity.aod
+ 1
− 1
View file @ 464d102f
......@@ -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>
......
entity/AnyContact_entity/initFilterProcess.js 0 → 100644
+ 19
− 0
View file @ 464d102f
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
entity/AnyContact_entity/onInit.js deleted 100644 → 0
+ 0
− 23
View file @ fc6bb429
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
entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
+ 1
− 1
View file @ 464d102f
......@@ -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
entity/Contact_entity/Contact_entity.aod
+ 1
− 1
View file @ 464d102f
......@@ -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>
......
entity/Contact_entity/initFilterProcess.js 0 → 100644
+ 19
− 0
View file @ 464d102f
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
entity/Contact_entity/onInit.js deleted 100644 → 0
+ 0
− 23
View file @ fc6bb429
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
entity/Organisation_entity/Organisation_entity.aod
+ 2
− 6
View file @ 464d102f
......@@ -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>
......
entity/Organisation_entity/afterUiInit.js 0 → 100644
+ 7
− 0
View file @ 464d102f
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
entity/Organisation_entity/initFilterProcess.js 0 → 100644
+ 19
− 0
View file @ 464d102f
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
entity/Organisation_entity/onInit.js deleted 100644 → 0
+ 0
− 30
View file @ fc6bb429
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");
}
entity/Person_entity/Person_entity.aod
+ 2
− 6
View file @ 464d102f
......@@ -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>
......
entity/Person_entity/afterUiInit.js 0 → 100644
+ 7
− 0
View file @ 464d102f
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
entity/Person_entity/initFilterProcess.js 0 → 100644
+ 19
− 0
View file @ 464d102f
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
entity/Person_entity/onInit.js deleted 100644 → 0
+ 0
− 30
View file @ fc6bb429
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");
}
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