Skip to content
Snippets Groups Projects
Commit c4e6df54 authored by Thomas Bindhammer's avatar Thomas Bindhammer
Browse files

Merge branch 'master_html' into 'master' 

Master html

See merge request !14
parents 10444eda 3bcf9234
No related branches found
No related tags found
1 merge request!14Master html
Hide whitespace changes
Inline Side-by-side
process/upgrade_ImporterCustomMappingFunctions_lib/process.js
+ 2
− 2
View file @ c4e6df54
......@@ -3643,7 +3643,7 @@ function migrateActivityInfoToHtml(pBulksize)
//The remaining data
for (i = count; i < count+rest; i++) {
if(arr[i][0].substr(0,5) != "<html>")
if(arr[i][0].substr(0,6) != "<html>")
{
str = "<html><body>"
+ arr[i][0].replace(/\r/g, "").replace(/\n/g, "<br>").replace(/( )/g,"&nbsp;")
......@@ -3685,7 +3685,7 @@ function migrateTasks(){
if(valDescription != null)
{
valDescription = valDescription.toString().split(":")[1].replace(/\\N/g, " ").replace(/\\R/g, " ");
valDescription = valDescription.toString().replace("DESCRIPTION:",'' ).replace(/\\N/g, "\n").replace(/\\R/g, "\r");
vals.push(valDescription);
cols.push("DESCRIPTION");
}
......
system/Upgrade/Upgrade.aod
+ 2
− 2
View file @ c4e6df54
......@@ -2,8 +2,8 @@
<system xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/system/1.1.0">
<name>Upgrade</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<serverConfigPath>C:\Users\t.bindhammer\Documents\AditoProjects\2k - project_UU\data\config\adito-upgrade.dev.c2.adito.cloud_serverconfig_system.xml</serverConfigPath>
<tunnelConfigPath>C:\Users\t.bindhammer\Documents\AditoProjects\2k - project_UU\data\config\adito-upgrade.dev.c2.adito.cloud_tunnelconfig.xml</tunnelConfigPath>
<serverConfigPath>$ADITODATA/upgrade/adito-upgrade.dev.c2.adito.cloud_serverconfig_system.xml</serverConfigPath>
<tunnelConfigPath>$ADITODATA/upgrade/adito-upgrade.dev.c2.adito.cloud_tunnelconfig.xml</tunnelConfigPath>
<productiveSystem v="false" />
<cloudSystemId>dev-adito-upgrade-c2-adito-cloud#a4a82022-9e9b-431a-8bdc-d542bed34cea</cloudSystemId>
<serverAddress>adito-upgrade.dev.c2.adito.cloud</serverAddress>
......
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