Skip to content
Snippets Groups Projects
Commit 943644eb authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

Merge branch 'ExportTemplateFixes' into 'master' 

[Projekt: Entwicklung - Neon][TicketNr.: 1055812][Anpassen Exportvorlagen und...

See merge request xrm/basic!175
parents 7432c2c7 44083a7e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 186 additions and 190 deletions
.liquibase/Data_alias/basic/2020.1.0/ExportTemplate/create_ExportTemplateTables.xml
+ 3
− 1
View file @ 943644eb
......@@ -7,7 +7,9 @@
<constraints primaryKey="true" primaryKeyName="PK_EXPORTTEMPLATEID"/>
</column>
<column name="TITLE" type="VARCHAR(100)"/>
<column name="SEPARATOR" type="VARCHAR(36)"/>
<column name="FIELDSEPARATOR" type="VARCHAR(36)"/>
<column name="SENTENCESEPARATOR" type="VARCHAR(36)"/>
<column name="FIELDDELIMITER" type="VARCHAR(36)"/>
<column name="ISOLANGUAGE" type="CHAR(3)"/>
<column name="DESCRIPTION" type="VARCHAR(1337)"/>
<column name="DATE_EDIT" type="TIMESTAMP(9)"/>
......
.liquibase/Data_alias/basic/2020.1.0/changelog.xml
+ 1
− 0
View file @ 943644eb
......@@ -6,4 +6,5 @@
<include file="DocumentTemplate/create_DocumentTemplatePlaceOfUse.xml" relativeToChangelogFile="true"/>
<include relativeToChangelogFile="true" file="changeType_SALESORDER_PAID_UNPAID.xml"/>
<include relativeToChangelogFile="true" file="changeType_SALESORDER_PAID_UNPAID.xml"/>
<include relativeToChangelogFile="true" file="delete_leadImportKeywords.xml"/>
</databaseChangeLog>
.liquibase/Data_alias/basic/2020.1.0/delete_leadImportKeywords.xml 0 → 100644
+ 75
− 0
View file @ 943644eb
<?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="d1b03d92-482f-4655-a380-6d2f83da3873">
<delete tableName="AB_KEYWORD_ATTRIBUTE">
<where>AB_KEYWORD_ATTRIBUTEID = ?</where>
<whereParams>
<param value="f14fe48f-48d8-470c-ba17-1d5c4a9c6728" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="59c5e0cb-a5e5-4bcf-81e5-cc9a37c3d533" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
<where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
<whereParams>
<param value="e9158951-d79b-4357-b4ab-7b2456190a44" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ATTRIBUTE">
<where>AB_KEYWORD_ATTRIBUTEID = ?</where>
<whereParams>
<param value="0c2203a0-6704-4400-b413-5deb876d67a5" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="2324a950-6767-4366-abf5-a343b7fd11f6" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
<where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
<whereParams>
<param value="b4a5cd3d-f3ea-4a0e-97d0-1429bee29edc" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="0c89fdc7-63cb-4e2b-a65a-ad77d3e58cc7" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
<where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
<whereParams>
<param value="7ab68748-27ca-4a21-a84e-aab22cdcb550" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ATTRIBUTE">
<where>AB_KEYWORD_ATTRIBUTEID = ?</where>
<whereParams>
<param value="38997f56-c86a-4dd3-b2ed-1fb73da604ae" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="73b3b4b3-6ba1-4551-b9dd-161079a1c755" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
<where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
<whereParams>
<param value="3b9fb859-3dd6-49c9-8ad4-cdefac3958f9" />
</whereParams>
</delete>
</changeSet>
</databaseChangeLog>
.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplate.xml
+ 12
− 4
View file @ 943644eb
......@@ -6,7 +6,9 @@
<column name="DATE_EDIT" valueDate="2020-03-02T10:43:23"/>
<column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
<column name="TITLE" value="Personen mit Anschriften"/>
<column name="SEPARATOR" value="SEMICOLON"/>
<column name="FIELDSEPARATOR" value="semicolon"/>
<column name="SENTENCESEPARATOR" value="carriage return and line feed"/>
<column name="FIELDDELIMITER" value="quotation mark"/>
<column name="ISOLANGUAGE" value="deu"/>
<column name="DESCRIPTION" value="Name mit Anrede, Titel und vollständiger Addresse"/>
<column name="USER_EDIT" value="Admin"/>
......@@ -17,7 +19,9 @@
<column name="DATE_EDIT" valueDate="2020-03-02T10:43:23"/>
<column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
<column name="TITLE" value="Firmen mit Addressen"/>
<column name="SEPARATOR" value="COMMA"/>
<column name="FIELDSEPARATOR" value="comma"/>
<column name="SENTENCESEPARATOR" value="carriage return and line feed"/>
<column name="FIELDDELIMITER" value="quotation mark"/>
<column name="ISOLANGUAGE" value="deu"/>
<column name="DESCRIPTION" value="Firmen und deren Addressen"/>
<column name="USER_EDIT" value="Admin"/>
......@@ -28,7 +32,9 @@
<column name="DATE_EDIT" valueDate="2020-03-02T10:43:23"/>
<column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
<column name="TITLE" value="Personen und Kontaktmöglichkeiten"/>
<column name="SEPARATOR" value="TAB"/>
<column name="FIELDSEPARATOR" value="tabulator"/>
<column name="SENTENCESEPARATOR" value="carriage return and line feed"/>
<column name="FIELDDELIMITER" value="quotation mark"/>
<column name="ISOLANGUAGE" value="deu"/>
<column name="DESCRIPTION" value="Anrede, Vor und Nachname sowie Email und Telefonnummer"/>
<column name="USER_EDIT" value="Admin"/>
......@@ -39,7 +45,9 @@
<column name="DATE_EDIT" valueDate="2020-03-02T10:43:23"/>
<column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
<column name="TITLE" value="Personen und Kontaktmöglichkeiten (Englisch)"/>
<column name="SEPARATOR" value="TAB"/>
<column name="FIELDSEPARATOR" value="tabulator"/>
<column name="SENTENCESEPARATOR" value="carriage return and line feed"/>
<column name="FIELDDELIMITER" value="quotation mark"/>
<column name="ISOLANGUAGE" value="eng"/>
<column name="DESCRIPTION" value="Anrede, Vor und Nachname sowie Email und Telefonnummer"/>
<column name="USER_EDIT" value="Admin"/>
......
.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplatefield.xml
+ 0
− 6
View file @ 943644eb
......@@ -49,12 +49,6 @@
<column name="FIELD" value="{@address@}"/>
<column name="SORTING" valueNumeric="8"/>
</insert>
<insert tableName="EXPORTTEMPLATEFIELD">
<column name="EXPORTTEMPLATEFIELDID" value="82059884-4b8e-4031-b32a-2b9a03b7109a"/>
<column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
<column name="FIELD" value="{@region@}"/>
<column name="SORTING" valueNumeric="6"/>
</insert>
<insert tableName="EXPORTTEMPLATEFIELD">
<column name="EXPORTTEMPLATEFIELDID" value="bfeb9284-6db4-4d15-a07b-9b3f21fe9c22"/>
<column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
......
.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
+ 0
− 1
View file @ 943644eb
......@@ -25,5 +25,4 @@
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_TaskType.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_AttributeType.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectProbability.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_ExportTemplateSeparator.xml"/>
</databaseChangeLog>
.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ExportTemplateSeparator.xml deleted 100644 → 0
+ 0
− 33
View file @ 7432c2c7
<?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="autogenerated" id="62ad16a9-7312-4dda-9e4b-460673b9af82">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="170a50ff-06b8-41f6-bd0e-40b62ea82d55"/>
<column name="KEYID" value="SEMICOLON"/>
<column name="TITLE" value="Semicolon"/>
<column name="CONTAINER" value="ExportTemplateSeparator"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="5f3cbf72-585d-4a80-88d0-b0df03f0f0e3"/>
<column name="KEYID" value="COMMA"/>
<column name="TITLE" value="Comma"/>
<column name="CONTAINER" value="ExportTemplateSeparator"/>
<column name="SORTING" valueNumeric="1"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="210e6e52-2201-4499-a74d-69ecf2424a0e"/>
<column name="KEYID" value="TAB"/>
<column name="TITLE" value="Tab"/>
<column name="CONTAINER" value="ExportTemplateSeparator"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
aliasDefinition/Data_alias/Data_alias.aod
+ 42
− 14
View file @ 943644eb
......@@ -14147,20 +14147,6 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>SEPARATOR</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>EXPORTTEMPLATEID</name>
<dbName></dbName>
......@@ -14231,6 +14217,48 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>FIELDSEPARATOR</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>SENTENCESEPARATOR</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>FIELDDELIMITER</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......
entity/ExportTemplate_entity/ExportTemplate_entity.aod
+ 27
− 27
View file @ 943644eb
......@@ -26,11 +26,11 @@
<mandatory v="true" />
</entityField>
<entityField>
<name>SEPARATOR</name>
<title>Separator</title>
<consumer>KeywordExportTemplateSeparator</consumer>
<name>FIELDSEPARATOR</name>
<title>Field separator</title>
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/separator/displayValueProcess.js</displayValueProcess>
<dropDownProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/fieldseparator/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="true" />
</entityField>
<entityField>
<name>ISOLANGUAGE</name>
......@@ -58,21 +58,6 @@
<name>DESCRIPTION</name>
<title>Description</title>
</entityField>
<entityConsumer>
<name>KeywordExportTemplateSeparator</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/keywordexporttemplateseparator/children/containername_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>Languages</name>
<dependency>
......@@ -142,6 +127,20 @@
<valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/comingfrom_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
<entityField>
<name>SENTENCESEPARATOR</name>
<title>Record separator</title>
<mandatory v="true" />
<dropDownProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/sentenceseparator/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="true" />
</entityField>
<entityField>
<name>FIELDDELIMITER</name>
<title>Field delimiter</title>
<mandatory v="true" />
<dropDownProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/fielddelimiter/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="true" />
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -206,16 +205,17 @@
<isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SEPARATOR.value</name>
<recordfield>EXPORTTEMPLATE.SEPARATOR</recordfield>
<isFilterable v="true" />
<isLookupFilter v="true" />
<name>FIELDSEPARATOR.value</name>
<recordfield>EXPORTTEMPLATE.FIELDSEPARATOR</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SEPARATOR.displayValue</name>
<expression>%aditoprj%/entity/ExportTemplate_entity/recordcontainers/db/recordfieldmappings/separator.displayvalue/expression.js</expression>
<isFilterable v="true" />
<isLookupFilter v="true" />
<name>SENTENCESEPARATOR.value</name>
<recordfield>EXPORTTEMPLATE.SENTENCESEPARATOR</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>FIELDDELIMITER.value</name>
<recordfield>EXPORTTEMPLATE.FIELDDELIMITER</recordfield>
<expression>%aditoprj%/entity/ExportTemplate_entity/recordcontainers/db/recordfieldmappings/fielddelimiter.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
......
entity/ExportTemplate_entity/entityfields/fielddelimiter/dropDownProcess.js 0 → 100644
+ 4
− 0
View file @ 943644eb
import("system.translate");
import("system.result");
result.object([["quotation mark", translate.text("quotation mark")]])
\ No newline at end of file
entity/ExportTemplate_entity/entityfields/fieldseparator/dropDownProcess.js 0 → 100644
+ 4
− 0
View file @ 943644eb
import("system.translate");
import("system.result");
result.object([["tabulator", translate.text("tabulator")], ["semicolon", translate.text("semicolon")], ["comma", translate.text("comma")]])
\ No newline at end of file
entity/ExportTemplate_entity/entityfields/keywordexporttemplateseparator/children/containername_param/valueProcess.js deleted 100644 → 0
+ 0
− 5
View file @ 7432c2c7
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
result.string($KeywordRegistry.exportTemplateSeparator());
entity/ExportTemplate_entity/entityfields/sentenceseparator/dropDownProcess.js 0 → 100644
+ 4
− 0
View file @ 943644eb
import("system.translate");
import("system.result");
result.object([["carriage return and line feed", translate.text("carriage return and line feed")]])
\ No newline at end of file
entity/ExportTemplate_entity/entityfields/separator/displayValueProcess.js deleted 100644 → 0
+ 0
− 13
View file @ 7432c2c7
import("system.vars");
import("KeywordRegistry_basic");
import("system.result");
import("Keyword_lib");
import("Sql_lib");
var separator = vars.get("$field.SEPARATOR");
if (separator)
{
var keyword = KeywordUtils.getViewValue($KeywordRegistry.exportTemplateSeparator(), separator);
result.string(keyword);
}
\ No newline at end of file
entity/ExportTemplate_entity/recordcontainers/db/recordfieldmappings/fielddelimiter.value/expression.js 0 → 100644
+ 4
− 0
View file @ 943644eb
import("system.translate");
import("system.result");
result.string(translate.text("EXPORTTEMPLATE.FIELDLIMITER"));
\ No newline at end of file
entity/ExportTemplate_entity/recordcontainers/db/recordfieldmappings/separator.displayvalue/expression.js deleted 100644 → 0
+ 0
− 6
View file @ 7432c2c7
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.exportTemplateSeparator(), "EXPORTTEMPLATE.SEPARATOR");
result.string(sql);
entity/KeywordEntry_entity/KeywordEntry_entity.aod
+ 0
− 24
View file @ 943644eb
......@@ -517,30 +517,12 @@
<fieldName>KeywordDupStatus</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>6d7b2f0a-dd23-4fa8-b1f3-83a711955599</name>
<entityName>Leadimport_entity</entityName>
<fieldName>KeywordFieldLimit</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>c31152b4-33d7-48e6-854e-9bd52bd02462</name>
<entityName>Leadimport_entity</entityName>
<fieldName>KeyWordFieldSeparator</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>5016fdbc-c41b-4d4d-bb3c-bd29b9625db5</name>
<entityName>Leadimport_entity</entityName>
<fieldName>KeywordImportStatus</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>778b54e6-f78e-40dd-a525-f0f44e1bb139</name>
<entityName>Leadimport_entity</entityName>
<fieldName>KeywordRecordSeparator</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>24b11c85-618a-494b-980b-a94b56523b78</name>
<entityName>WorkflowStartConfig_entity</entityName>
......@@ -559,12 +541,6 @@
<fieldName>TriggerKeyword</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>5d7ad44b-b2c0-4b6c-a0d6-8be9ee3bc82d</name>
<entityName>ExportTemplate_entity</entityName>
<fieldName>KeywordExportTemplateSeparator</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>38c8a85b-3bea-44cf-b57e-23eba340adb4</name>
<entityName>ExportTemplatePlaceOfUse_entity</entityName>
......
entity/Leadimport_entity/Leadimport_entity.aod
+ 6
− 51
View file @ 943644eb
......@@ -71,26 +71,23 @@
<entityField>
<name>SENTENCESEPARATOR</name>
<title>Record separator</title>
<consumer>KeywordRecordSeparator</consumer>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/sentenceseparator/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/sentenceseparator/displayValueProcess.js</displayValueProcess>
<dropDownProcess>%aditoprj%/entity/Leadimport_entity/entityfields/sentenceseparator/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="true" />
</entityField>
<entityField>
<name>FIELDSEPARATOR</name>
<title>Field separator</title>
<consumer>KeyWordFieldSeparator</consumer>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/fieldseparator/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/fieldseparator/displayValueProcess.js</displayValueProcess>
<dropDownProcess>%aditoprj%/entity/Leadimport_entity/entityfields/fieldseparator/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="true" />
</entityField>
<entityField>
<name>FIELDDELIMITERS</name>
<title>Field delimiter</title>
<consumer>KeywordFieldLimit</consumer>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/fielddelimiters/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/fielddelimiters/displayValueProcess.js</displayValueProcess>
<dropDownProcess>%aditoprj%/entity/Leadimport_entity/entityfields/fielddelimiters/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="true" />
</entityField>
<entityField>
<name>IMPORTSOURCE</name>
......@@ -111,20 +108,6 @@
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeyWordFieldSeparator</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/keywordfieldseparator/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>Leadimport_Empl</name>
<dependency>
......@@ -133,34 +116,6 @@
<fieldName>Employees</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordFieldLimit</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/keywordfieldlimit/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordRecordSeparator</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/keywordrecordseparator/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>USER_NEW</name>
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/user_new/valueProcess.js</valueProcess>
......
entity/Leadimport_entity/entityfields/fielddelimiters/displayValueProcess.js deleted 100644 → 0
+ 0
− 5
View file @ 7432c2c7
import("system.result");
import("system.vars");
import("KeywordRegistry_basic");
import("Keyword_lib");
result.string(KeywordUtils.getViewValue($KeywordRegistry.fieldLimit(), vars.get("$field.FIELDDELIMITERS")));
\ No newline at end of file
entity/Leadimport_entity/entityfields/fielddelimiters/dropDownProcess.js 0 → 100644
+ 4
− 0
View file @ 943644eb
import("system.translate");
import("system.result");
result.object([["quotation mark", translate.text("quotation mark")]])
\ No newline at end of file
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