Skip to content
Snippets Groups Projects
Commit beda7922 authored by Martin Groppe's avatar Martin Groppe Committed by Sebastian Listl
Browse files

M 1046618 bulkmail copy recipients optional

parent effb122d
No related branches found
No related tags found
No related merge requests found
...@@ -349,6 +349,13 @@ ...@@ -349,6 +349,13 @@
<fieldName>#PROVIDER</fieldName> <fieldName>#PROVIDER</fieldName>
</dependency> </dependency>
</entityConsumer> </entityConsumer>
<entityField>
<name>copyRecipients</name>
<title>Copy Recipients</title>
<contentType>BOOLEAN</contentType>
<stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/copyrecipients/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/copyrecipients/valueProcess.js</valueProcess>
</entityField>
<entityField> <entityField>
<name>ACTIVE</name> <name>ACTIVE</name>
</entityField> </entityField>
......
import("system.translate");
import("system.entities"); import("system.entities");
import("system.vars"); import("system.vars");
import("DocumentTemplate_lib"); import("DocumentTemplate_lib");
...@@ -20,7 +21,8 @@ if (!vars.exists("$context.dataCopied") && vars.get("$param.CopyBulkMailId_param ...@@ -20,7 +21,8 @@ if (!vars.exists("$context.dataCopied") && vars.get("$param.CopyBulkMailId_param
"SUBJECT", "SUBJECT",
"TESTING_CONTACT_ID", "TESTING_CONTACT_ID",
"TESTING_EMAIL_ADDRESS", "TESTING_EMAIL_ADDRESS",
"USE_TEMPLATE_ATTACHMENTS" "USE_TEMPLATE_ATTACHMENTS",
"INTEREST_ID"
]) ])
.uid(vars.get("$param.CopyBulkMailId_param")); .uid(vars.get("$param.CopyBulkMailId_param"));
...@@ -29,8 +31,15 @@ if (!vars.exists("$context.dataCopied") && vars.get("$param.CopyBulkMailId_param ...@@ -29,8 +31,15 @@ if (!vars.exists("$context.dataCopied") && vars.get("$param.CopyBulkMailId_param
var data = entities.getRows(conf)[0]; var data = entities.getRows(conf)[0];
for (let field in data) for (let field in data)
{ {
vars.set("$field." + field, data[field]); if (field == "NAME")
{
vars.set("$field." + field, data[field]+" - " + translate.text("copy"));
}
else
{
vars.set("$field." + field, data[field]);
}
} }
vars.set("$context.dataCopied", true) vars.set("$context.dataCopied", true)
......
import("system.result");
import("system.vars");
import("system.neon");
if (vars.get("$param.CopyBulkMailId_param"))
{
result.string(neon.COMPONENTSTATE_EDITABLE)
}
else
{
result.string(neon.COMPONENTSTATE_INVISIBLE)
}
\ No newline at end of file
import("system.neon");
import("system.vars");
import("system.result");
if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(1);
\ No newline at end of file
import("Util_lib");
import("KeywordRegistry_basic"); import("KeywordRegistry_basic");
import("Communication_lib"); import("Communication_lib");
import("Workflow_lib"); import("Workflow_lib");
...@@ -31,7 +32,7 @@ if (template && template.content && BulkMailUtils.isValidTemplateType(template.t ...@@ -31,7 +32,7 @@ if (template && template.content && BulkMailUtils.isValidTemplateType(template.t
} }
// CopyBulkMail Recipients // CopyBulkMail Recipients
if (vars.get("$param.CopyBulkMailId_param")){ if (vars.get("$param.CopyBulkMailId_param") && Utils.toBoolean(vars.get("$field.copyRecipients"))){
var BulkMailParam = vars.get("$param.CopyBulkMailId_param"); var BulkMailParam = vars.get("$param.CopyBulkMailId_param");
...@@ -87,4 +88,5 @@ if (vars.get("$param.CopyBulkMailId_param")){ ...@@ -87,4 +88,5 @@ if (vars.get("$param.CopyBulkMailId_param")){
}); });
db.inserts(inserts); db.inserts(inserts);
} }
WorkflowSignalSender.inserted(); WorkflowSignalSender.inserted();
\ No newline at end of file
...@@ -2778,6 +2778,10 @@ ...@@ -2778,6 +2778,10 @@
<key>Map data © %0 contributors | %1 | %2</key> <key>Map data © %0 contributors | %1 | %2</key>
<value>Kartendaten © %0 Mitwirkende | %1 | %2</value> <value>Kartendaten © %0 Mitwirkende | %1 | %2</value>
</entry> </entry>
<entry>
<key>copy</key>
<value>Kopie</value>
</entry>
<entry> <entry>
<key>Person</key> <key>Person</key>
<value>Person</value> <value>Person</value>
...@@ -2790,6 +2794,10 @@ ...@@ -2790,6 +2794,10 @@
<key>Relations</key> <key>Relations</key>
<value>Beziehungen</value> <value>Beziehungen</value>
</entry> </entry>
<entry>
<key>Copy Recipients</key>
<value>Empfänger kopieren</value>
</entry>
<entry> <entry>
<key>dd.MM.yyyy</key> <key>dd.MM.yyyy</key>
<value>dd.MM.yyyy</value> <value>dd.MM.yyyy</value>
......
...@@ -80,6 +80,10 @@ ...@@ -80,6 +80,10 @@
<name>548de09e-4e29-443f-a676-725120be47c8</name> <name>548de09e-4e29-443f-a676-725120be47c8</name>
<entityField>EMPLOYEE_CONTACT_ID</entityField> <entityField>EMPLOYEE_CONTACT_ID</entityField>
</entityFieldLink> </entityFieldLink>
<entityFieldLink>
<name>f66aec9b-2f23-4008-b060-3488ec632295</name>
<entityField>copyRecipients</entityField>
</entityFieldLink>
<entityFieldLink> <entityFieldLink>
<name>1891cd3a-34a5-4c7d-9e35-635640476c63</name> <name>1891cd3a-34a5-4c7d-9e35-635640476c63</name>
<entityField>INTEREST_ID</entityField> <entityField>INTEREST_ID</entityField>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment