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

Merge branch 'cm_1076268_email_mailbridge_user' into '2021.1.0' 

Cm 1076268 email mailbridge user

See merge request xrm/basic!939
parents 442ec035 38ed5ab5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.liquibase/_____SYSTEMALIAS/basic/mailbridge/mailbridgeUser.xml 0 → 100644
+ 75
− 0
View file @ 987951f6
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
<changeSet author="s.pongratz" id="b8ccd980-c120-4938-99bc-deb728c6b6c3">
<insert tableName="ASYS_USERS">
<column name="ID" value="1e1771ef-4435-4b02-9e58-026d07eb3dcd"/>
<column name="DATE_NEW" valueDate="2021-04-30T13:03:38.877"/>
<column name="DATE_EDIT" valueDate="2021-04-30T13:09:41.313"/>
<column name="NAME" value="_____USER_b9baa774-7239-4844-88f4-cddb2cdb3257"/>
<column name="GROUPID" value="BASIC"/>
<column name="PROPKEY" value="lastModified"/>
<column name="PROPVAL" value="1619780981313"/>
<column name="PROPVAL_CLOB"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="ID" value="25c3d371-8c2e-4f13-b315-9be499ca3e65"/>
<column name="DATE_NEW" valueDate="2021-04-30T13:03:38.877"/>
<column name="DATE_EDIT" valueDate="2021-04-30T13:03:38.877"/>
<column name="NAME" value="_____USER_b9baa774-7239-4844-88f4-cddb2cdb3257"/>
<column name="GROUPID" value="BASIC"/>
<column name="PROPKEY" value="name"/>
<column name="PROPVAL" value="_____USER_b9baa774-7239-4844-88f4-cddb2cdb3257"/>
<column name="PROPVAL_CLOB"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="ID" value="b8d4548a-9528-4db9-a122-429b1df4968e"/>
<column name="DATE_NEW" valueDate="2021-04-30T13:03:38.877"/>
<column name="DATE_EDIT" valueDate="2021-04-30T13:09:34.112"/>
<column name="NAME" value="_____USER_b9baa774-7239-4844-88f4-cddb2cdb3257"/>
<column name="GROUPID" value="BASIC"/>
<column name="PROPKEY" value="title"/>
<column name="PROPVAL" value="mailbridge"/>
<column name="PROPVAL_CLOB"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="ID" value="f634e205-4130-4e9e-8736-28fe41959de6"/>
<column name="DATE_NEW" valueDate="2021-04-30T13:09:21.362"/>
<column name="DATE_EDIT" valueDate="2021-04-30T13:09:21.362"/>
<column name="NAME" value="_____USER_b9baa774-7239-4844-88f4-cddb2cdb3257"/>
<column name="GROUPID" value="BASIC"/>
<column name="PROPKEY" value="email"/>
<column name="PROPVAL" value="mailbridge@domain.local"/>
<column name="PROPVAL_CLOB"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="ID" value="33cc359d-6d02-454b-8fe3-15ef692a37a1"/>
<column name="DATE_NEW" valueDate="2021-04-30T13:09:21.369"/>
<column name="DATE_EDIT" valueDate="2021-04-30T13:09:21.369"/>
<column name="NAME" value="_____USER_b9baa774-7239-4844-88f4-cddb2cdb3257"/>
<column name="GROUPID" value="BASIC"/>
<column name="PROPKEY" value="isActive"/>
<column name="PROPVAL" value="true"/>
<column name="PROPVAL_CLOB"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="ID" value="0a9f5363-2d0e-4591-95bd-62beeb952925"/>
<column name="DATE_NEW" valueDate="2021-04-30T13:09:41.315"/>
<column name="DATE_EDIT" valueDate="2021-04-30T13:09:41.315"/>
<column name="NAME" value="_____USER_b9baa774-7239-4844-88f4-cddb2cdb3257"/>
<column name="GROUPID" value="ROLE"/>
<column name="PROPKEY" value="roleNames"/>
<column name="PROPVAL" value="INTERNAL_TECHNICAL"/>
<column name="PROPVAL_CLOB"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="ID" value="e65c5d62-bfb7-4b67-b7cc-65fe06fb7c81"/>
<column name="DATE_NEW" valueDate="2021-04-30T13:09:11.757"/>
<column name="DATE_EDIT" valueDate="2021-04-30T13:09:11.757"/>
<column name="NAME" value="_____USER_b9baa774-7239-4844-88f4-cddb2cdb3257"/>
<column name="GROUPID" value="BASIC"/>
<column name="PROPKEY" value="calendarID"/>
<column name="PROPVAL" value="mailbridge@domain.local"/>
<column name="PROPVAL_CLOB"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/_____SYSTEMALIAS/changelog.xml
+ 1
− 0
View file @ 987951f6
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include relativeToChangelogFile="true" file="basic/init/init.xml"/>
<include relativeToChangelogFile="true" file="basic/mailbridge/mailbridgeUser.xml"/>
<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
......
entity/Organisation_entity/Organisation_entity.aod
+ 1
− 1
View file @ 987951f6
......@@ -51,7 +51,7 @@
<entityField>
<name>NAME</name>
<title>Name</title>
<contentType>LONG_TEXT</contentType>
<contentType>TEXT</contentType>
<mandatory v="true" />
</entityField>
<entityField>
......
entity/QuickEntry_entity/QuickEntry_entity.aod
+ 1
− 1
View file @ 987951f6
......@@ -17,7 +17,7 @@
<entityField>
<name>ORGANISATION_NAME</name>
<title>Company</title>
<contentType>LONG_TEXT</contentType>
<contentType>TEXT</contentType>
<mandatoryProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/organisation_name/mandatoryProcess.js</mandatoryProcess>
</entityField>
<entityConsumer>
......
process/Email_lib/process.js
+ 1
− 1
View file @ 987951f6
......@@ -117,7 +117,7 @@ EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComing
EmailWritingUtils.getMailbridgeAddress = function ()
{
return "mailbridge@domain.local"; //TODO: not hardcoded
return tools.getUser("mailbridge", tools.PROFILE_DEFAULT)[tools.PARAMS][tools.EMAIL];
}
/**
......
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