Skip to content
Snippets Groups Projects
Commit 9250d6ce authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

merged origin/2021.0.0 into 2021.0

parents 85e29e69 0f3dbf83
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 281 additions and 59 deletions
.liquibase/Data_alias/basic/2021.0.0/Keywords/update_keywordAttribute.xml
+ 3
− 0
View file @ 9250d6ce
...@@ -8,5 +8,8 @@ ...@@ -8,5 +8,8 @@
<dropNotNullConstraint tableName="AB_KEYWORD_ATTRIBUTE" <dropNotNullConstraint tableName="AB_KEYWORD_ATTRIBUTE"
columnName="CONTAINER" columnName="CONTAINER"
columnDataType="VARCHAR(80)"/> columnDataType="VARCHAR(80)"/>
<createIndex indexName="IDX_AB_KEYWORD_ATTR_CAT_ID" tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_CATEGORY_ID"/>
</createIndex>
</changeSet> </changeSet>
</databaseChangeLog> </databaseChangeLog>
.liquibase/Data_alias/basic/2021.0.0/Keywords/update_keywordEntry.xml
+ 3
− 0
View file @ 9250d6ce
...@@ -8,5 +8,8 @@ ...@@ -8,5 +8,8 @@
<dropNotNullConstraint tableName="AB_KEYWORD_ENTRY" <dropNotNullConstraint tableName="AB_KEYWORD_ENTRY"
columnName="CONTAINER" columnName="CONTAINER"
columnDataType="VARCHAR(80)"/> columnDataType="VARCHAR(80)"/>
<createIndex indexName="IDX_AB_KEYWORD_ENTRY_CAT_ID" tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_CATEGORY_ID"/>
</createIndex>
</changeSet> </changeSet>
</databaseChangeLog> </databaseChangeLog>
.liquibase/Data_alias/changelog.xml
+ 1
− 1
View file @ 9250d6ce
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
<include relativeToChangelogFile="true" file="basic/2021.0.0/changelog.xml"/> <include relativeToChangelogFile="true" file="basic/2021.0.0/changelog.xml"/>
<!--enable this only when you definetly want to overwrite the existing data with demo records:--> <!--enable this only when you definetly want to overwrite the existing data with demo records:-->
<!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>--> <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
</databaseChangeLog> </databaseChangeLog>
\ No newline at end of file
aliasDefinition/Data_alias/Data_alias.aod
+ 135
− 3
View file @ 9250d6ce
...@@ -6671,7 +6671,7 @@ ...@@ -6671,7 +6671,7 @@
<scale v="0" /> <scale v="0" />
<notNull v="false" /> <notNull v="false" />
<isUnique v="false" /> <isUnique v="false" />
<index v="false" /> <index v="true" />
<documentation></documentation> <documentation></documentation>
<title></title> <title></title>
<description></description> <description></description>
...@@ -6834,7 +6834,7 @@ ...@@ -6834,7 +6834,7 @@
<columnType v="12" /> <columnType v="12" />
<size v="80" /> <size v="80" />
<scale v="0" /> <scale v="0" />
<notNull v="true" /> <notNull v="false" />
<isUnique v="false" /> <isUnique v="false" />
<index v="true" /> <index v="true" />
<documentation></documentation> <documentation></documentation>
...@@ -6899,7 +6899,7 @@ ...@@ -6899,7 +6899,7 @@
<scale v="0" /> <scale v="0" />
<notNull v="false" /> <notNull v="false" />
<isUnique v="false" /> <isUnique v="false" />
<index v="false" /> <index v="true" />
<documentation></documentation> <documentation></documentation>
<description></description> <description></description>
</entityFieldDb> </entityFieldDb>
...@@ -18239,6 +18239,138 @@ ...@@ -18239,6 +18239,138 @@
</entityFieldDb> </entityFieldDb>
</entityFields> </entityFields>
</entityDb> </entityDb>
<entityDb>
<name>AB_SYNCCONTACT</name>
<dbName></dbName>
<idColumn>SYNCCONTACTID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
<title></title>
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
<auditMode v="0" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
<syncIds></syncIds>
</auditSyncConfig>
<entityFields>
<entityFieldDb>
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>EXCHANGEID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="254" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>ASYS_FAVORITEID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>USER_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="46" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>SYNCCONTACTID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATE_DEL</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
</entities> </entities>
</entityGroup> </entityGroup>
</aliasDefDb> </aliasDefDb>
......
entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+ 21
− 7
View file @ 9250d6ce
...@@ -294,13 +294,6 @@ ...@@ -294,13 +294,6 @@
<name>TARGET_CONTEXT</name> <name>TARGET_CONTEXT</name>
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/target_context/valueProcess.js</valueProcess> <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/target_context/valueProcess.js</valueProcess>
</entityField> </entityField>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
<onActionProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
<entityField> <entityField>
<name>REPLACEMENTNAME</name> <name>REPLACEMENTNAME</name>
<title>Replacement name</title> <title>Replacement name</title>
...@@ -347,6 +340,27 @@ ...@@ -347,6 +340,27 @@
<name>#PROVIDER_AGGREGATES</name> <name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" /> <useAggregates v="true" />
</entityProvider> </entityProvider>
<entityField>
<name>HtmlEdit</name>
<title>HTML Editor</title>
<contentType>HTML</contentType>
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmledit/valueProcess.js</valueProcess>
</entityField>
<entityActionField>
<name>openHtmlEditor</name>
<title>Edit HTML</title>
<onActionProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openhtmleditor/onActionProcess.js</onActionProcess>
<iconId>NEON:PENCIL</iconId>
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openhtmleditor/stateProcess.js</stateProcess>
</entityActionField>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
<onActionProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
</entityFields> </entityFields>
<recordContainers> <recordContainers>
<dbRecordContainer> <dbRecordContainer>
......
entity/DocumentTemplate_entity/entityfields/htmledit/valueProcess.js 0 → 100644
+ 10
− 0
View file @ 9250d6ce
import("system.result");
import("system.neon");
import("DocumentTemplate_lib");
import("system.vars");
if((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW) && vars.get("$this.value") == null)
{
var [content, type] = DocumentTemplateUtils.getTemplateContent(vars.get("$field.DOCUMENTTEMPLATEID"), new FileUpload(vars.get("$field.BINDATA")));
result.string(content);
}
\ No newline at end of file
entity/DocumentTemplate_entity/entityfields/openhtmleditor/onActionProcess.js 0 → 100644
+ 6
− 0
View file @ 9250d6ce
import("system.logging");
import("system.vars");
import("DocumentTemplate_lib");
import("system.neon");
neon.openContext("DocumentTemplate", "DocumentTemplateHtmlEdit_view", [vars.get("$field.DOCUMENTTEMPLATEID")], neon.OPERATINGSTATE_EDIT, null)
entity/DocumentTemplate_entity/entityfields/openhtmleditor/stateProcess.js 0 → 100644
+ 11
− 0
View file @ 9250d6ce
import("KeywordRegistry_basic");
import("system.result");
import("system.vars");
import("DocumentTemplate_lib");
import("system.neon");
var template = DocumentTemplateUtils.getTemplate(vars.get("$field.DOCUMENTTEMPLATEID"), false);
var kind = vars.get("$field.KIND");
if(template.type == DocumentTemplate.types.HTML && kind == $KeywordRegistry.documentTemplateType$textModular() || kind == $KeywordRegistry.documentTemplateType$mail())
result.string(neon.COMPONENTSTATE_EDITABLE);
entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
+ 1
− 1
View file @ 9250d6ce
import("system.logging");
import("Workflow_lib"); import("Workflow_lib");
import("DocumentTemplate_lib"); import("DocumentTemplate_lib");
import("system.vars"); import("system.vars");
...@@ -8,5 +9,4 @@ var upload = new FileUpload(vars.get("$field.BINDATA")); ...@@ -8,5 +9,4 @@ var upload = new FileUpload(vars.get("$field.BINDATA"));
var rowId = vars.get("$local.uid"); var rowId = vars.get("$local.uid");
DocumentTemplateUtils.insertTemplateData(rowId, upload, rowdata["DOCUMENTTEMPLATE.KIND"], vars.get("$field.Content"), rowdata["DOCUMENTTEMPLATE.CLASSIFICATION"], rowdata["DOCUMENTTEMPLATE.NAME"]); DocumentTemplateUtils.insertTemplateData(rowId, upload, rowdata["DOCUMENTTEMPLATE.KIND"], vars.get("$field.Content"), rowdata["DOCUMENTTEMPLATE.CLASSIFICATION"], rowdata["DOCUMENTTEMPLATE.NAME"]);
WorkflowSignalSender.inserted(); WorkflowSignalSender.inserted();
\ No newline at end of file
entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
+ 3
− 0
View file @ 9250d6ce
...@@ -10,4 +10,7 @@ var rowId = vars.get("$local.uid"); ...@@ -10,4 +10,7 @@ var rowId = vars.get("$local.uid");
DocumentTemplateUtils.updateTemplateData(rowId, upload, rowdata["DOCUMENTTEMPLATE.KIND"], content, rowdata["DOCUMENTTEMPLATE.CLASSIFICATION"], rowdata["DOCUMENTTEMPLATE.NAME"]); DocumentTemplateUtils.updateTemplateData(rowId, upload, rowdata["DOCUMENTTEMPLATE.KIND"], content, rowdata["DOCUMENTTEMPLATE.CLASSIFICATION"], rowdata["DOCUMENTTEMPLATE.NAME"]);
if(vars.get("$field.HtmlEdit") != null)
DocumentTemplateUtils.updateTemplateData(rowId, upload, rowdata["DOCUMENTTEMPLATE.KIND"], vars.get("$field.HtmlEdit"), rowdata["DOCUMENTTEMPLATE.CLASSIFICATION"], rowdata["DOCUMENTTEMPLATE.NAME"])
WorkflowSignalSender.updated(); WorkflowSignalSender.updated();
\ No newline at end of file
entity/Organisation_entity/entityfields/map_config/valueProcess.js
+ 9
− 42
View file @ 9250d6ce
import("system.translate");
import("system.vars");
import("system.util");
import("system.fileIO");
import("system.result"); import("system.result");
import("system.vars");
import("system.vars");
import("MapViewTemplate_lib");
/* !WARNING! This openstreetmap TileLayer Server is only used for demonstration purposes and to show how this map template configuration works. var config = MapViewConfigUtils.getBaseConfiguration();
* From the tile-usage-policy: config.startingCenterPosition.lat = parseFloat(vars.get("$param.MapViewCenterLat_param"));
* "Heavy use (e.g. distributing an app that uses tiles from openstreetmap.org) is forbidden without prior permission" config.startingCenterPosition.lon = parseFloat(vars.get("$param.MapViewCenterLon_param"));
* See more about the openstreetmap policy here: config.startingCenterPosition.zoomLevel = 5;
* https://operations.osmfoundation.org/policies/tiles/
*
* This means you have to change the following tile source for using the MapViewTemplate in any real scenario (Dev-Serers, Test-Servers,
* Production-Servers and so on).
*/
var licenseCaption = translate.text("License");
var contributionCaption = translate.text("Contribute map data");
var selectedTile = {
title: "Open Street Map",
url: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
attribution: translate.withArguments("Map data © %0 contributors | %1 | %2", [
"<a href=\"https://openstreetmap.org\">OpenStreetMap</a>",
"<a href=\"https://www.openstreetmap.org/copyright\">" + licenseCaption + "</a>",
"<a href=\"https://www.openstreetmap.org/fixthemap\">" + contributionCaption + "</a>"])
};
var config = { var tileConfig = MapViewConfigUtils.getMainTileConfig();
startingCenterPosition : { config.tiles = tileConfig;
lat: parseFloat(vars.get("$param.MapViewCenterLat_param")),
lon: parseFloat(vars.get("$param.MapViewCenterLon_param")),
zoomLevel: 5,
//but let's try to locate the users posistion for a better view
autoLocate: true
},
boundaries: {
minZoom: 0,
maxZoom: 20
},
tiles: [
/*add more tile layer sources here*/
]
};
//when opening the AroundLocation view we do want to have the source organisation as center, so let's not overwrite the starting center position by //when opening the AroundLocation view we do want to have the source organisation as center, so let's not overwrite the starting center position by
//looking for the users current location //looking for the users current location
...@@ -50,7 +19,5 @@ if (vars.get("$param.MapViewAdditionalFeatures_param")) ...@@ -50,7 +19,5 @@ if (vars.get("$param.MapViewAdditionalFeatures_param"))
config.startingCenterPosition.autoLocate = false; config.startingCenterPosition.autoLocate = false;
} }
config.tiles.push(selectedTile);//the last tile layer will be always selected by leaflet, so let's push it here
var res = JSON.stringify(config); var res = JSON.stringify(config);
result.string(res); result.string(res);
\ No newline at end of file
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 12
− 0
View file @ 9250d6ce
...@@ -8076,6 +8076,18 @@ ...@@ -8076,6 +8076,18 @@
<entry> <entry>
<key>EML files can't be edited here. You can download, edit and reupload the template to change the content.</key> <key>EML files can't be edited here. You can download, edit and reupload the template to change the content.</key>
</entry> </entry>
<entry>
<key>Edit HTML</key>
</entry>
<entry>
<key>HTML Editor</key>
</entry>
<entry>
<key>Add to order</key>
</entry>
<entry>
<key>Add to offer</key>
</entry>
</keyValueMap> </keyValueMap>
<font name="Dialog" style="0" size="11" /> <font name="Dialog" style="0" size="11" />
<sqlModels> <sqlModels>
......
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 11
− 4
View file @ 9250d6ce
...@@ -51,12 +51,12 @@ ...@@ -51,12 +51,12 @@
<value>Es ist nicht erlaubt Vertriebsprojektphasen zu überspringen.</value> <value>Es ist nicht erlaubt Vertriebsprojektphasen zu überspringen.</value>
</entry> </entry>
<entry> <entry>
<key>Add to offer</key> <key>Add to offer</key>
<value>Zu Angebot hinzufügen</value> <value>Zu Angebot hinzufügen</value>
</entry> </entry>
<entry> <entry>
<key>Add to order</key> <key>Add to order</key>
<value>Zu Beleg hinzufügen</value> <value>Zu Beleg hinzufügen</value>
</entry> </entry>
<entry> <entry>
<key>Probability AI</key> <key>Probability AI</key>
...@@ -2962,6 +2962,10 @@ ...@@ -2962,6 +2962,10 @@
<key>Tonga</key> <key>Tonga</key>
<value>Tonga</value> <value>Tonga</value>
</entry> </entry>
<entry>
<key>Edit HTML</key>
<value>HTML bearbeiten</value>
</entry>
<entry> <entry>
<key>Western Sahara</key> <key>Western Sahara</key>
<value>Westsahara</value> <value>Westsahara</value>
...@@ -10637,6 +10641,9 @@ Bitte Datumseingabe prüfen</value> ...@@ -10637,6 +10641,9 @@ Bitte Datumseingabe prüfen</value>
<entry> <entry>
<key>Calendar week</key> <key>Calendar week</key>
</entry> </entry>
<entry>
<key>HTML Editor</key>
</entry>
</keyValueMap> </keyValueMap>
<font name="Dialog" style="0" size="11" /> <font name="Dialog" style="0" size="11" />
</language> </language>
language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+ 12
− 0
View file @ 9250d6ce
...@@ -8157,6 +8157,18 @@ ...@@ -8157,6 +8157,18 @@
<entry> <entry>
<key>EML files can't be edited here. You can download, edit and reupload the template to change the content.</key> <key>EML files can't be edited here. You can download, edit and reupload the template to change the content.</key>
</entry> </entry>
<entry>
<key>Edit HTML</key>
</entry>
<entry>
<key>HTML Editor</key>
</entry>
<entry>
<key>Add to order</key>
</entry>
<entry>
<key>Add to offer</key>
</entry>
</keyValueMap> </keyValueMap>
<font name="Dialog" style="0" size="11" /> <font name="Dialog" style="0" size="11" />
</language> </language>
neonContext/Document/Document.aod
+ 3
− 0
View file @ 9250d6ce
...@@ -37,5 +37,8 @@ ...@@ -37,5 +37,8 @@
<name>434ed60c-8219-4ef5-b795-6d72b9ae48c9</name> <name>434ed60c-8219-4ef5-b795-6d72b9ae48c9</name>
<view>DocumentWithIdFilter_view</view> <view>DocumentWithIdFilter_view</view>
</neonViewReference> </neonViewReference>
<neonViewReference>
<name>0dfe06a2-7a32-40b4-bac7-3b408956deba</name>
</neonViewReference>
</references> </references>
</neonContext> </neonContext>
neonContext/DocumentTemplate/DocumentTemplate.aod
+ 4
− 0
View file @ 9250d6ce
...@@ -26,5 +26,9 @@ ...@@ -26,5 +26,9 @@
<name>df9dab28-502c-41c2-8a8f-1c0745ca14dd</name> <name>df9dab28-502c-41c2-8a8f-1c0745ca14dd</name>
<view>DocumentTemplateFilterSmall_view</view> <view>DocumentTemplateFilterSmall_view</view>
</neonViewReference> </neonViewReference>
<neonViewReference>
<name>9a7692da-4374-4fd8-a65f-aea4100bedca</name>
<view>DocumentTemplateHtmlEdit_view</view>
</neonViewReference>
</references> </references>
</neonContext> </neonContext>
neonView/DocumentTemplateHtmlEdit_view/DocumentTemplateHtmlEdit_view.aod 0 → 100644
+ 22
− 0
View file @ 9250d6ce
<?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.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
<name>DocumentTemplateHtmlEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<noneLayout>
<name>layout</name>
</noneLayout>
</layout>
<children>
<genericViewTemplate>
<name>Edit</name>
<editMode v="true" />
<fields>
<entityFieldLink>
<name>30901b23-7bad-42d6-aa14-ebc11268d407</name>
<entityField>HtmlEdit</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+ 4
− 0
View file @ 9250d6ce
...@@ -85,6 +85,10 @@ ...@@ -85,6 +85,10 @@
<name>dataCaching.client.forceDisable</name> <name>dataCaching.client.forceDisable</name>
<description>Enabling this option will disable the per-client-context data-cache within the customzing (for exameple the caching of Keywords). This is usefull if you're testing and want to frequently add data like keywords, etc. which are cached which help of the "DataCaching_lib".</description> <description>Enabling this option will disable the per-client-context data-cache within the customzing (for exameple the caching of Keywords). This is usefull if you're testing and want to frequently add data like keywords, etc. which are cached which help of the "DataCaching_lib".</description>
</customBooleanProperty> </customBooleanProperty>
<customStringProperty>
<name>geo.maptiler.apikey</name>
<description>An API Key for using Maptiler functions. For example for the MapViewTemplate.</description>
</customStringProperty>
</customConfigProperties> </customConfigProperties>
<customProperties> <customProperties>
<customBooleanProperty> <customBooleanProperty>
......
process/DocumentTemplate_lib/process.js
+ 1
− 1
View file @ 9250d6ce
...@@ -913,7 +913,7 @@ DocumentTemplateUtils.chooseSuppliedTemplate = function (pFileUpload, pKind, pTe ...@@ -913,7 +913,7 @@ DocumentTemplateUtils.chooseSuppliedTemplate = function (pFileUpload, pKind, pTe
// use fileUpload but use the custom text as bindata // use fileUpload but use the custom text as bindata
pFileUpload.bindata = util.encodeBase64String(pText); pFileUpload.bindata = util.encodeBase64String(pText);
} }
else if (!pFileUpload.isFilled() && pText != "" && pKind == $KeywordRegistry.documentTemplateType$textModular()) // edit is only allowed in modular templates else if (!pFileUpload.isFilled() && pText != "" && pKind == $KeywordRegistry.documentTemplateType$textModular() || pKind == $KeywordRegistry.documentTemplateType$mail()) // edit is only allowed in modular templates
{ {
pFileUpload.filename = pTemplateName; pFileUpload.filename = pTemplateName;
......
process/MapViewTemplate_lib/MapViewTemplate_lib.aod 0 → 100644
+ 9
− 0
View file @ 9250d6ce
<?xml version="1.0" encoding="UTF-8"?>
<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>MapViewTemplate_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/MapViewTemplate_lib/process.js</process>
<variants>
<element>LIBRARY</element>
</variants>
</process>
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