dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Join front-end

Browse Source
This commit is contained in:
AndrewVolosytnykhThingsboard 2021-04-21 13:05:31 +03:00
parent 366ac8768b
commit 8281609df0
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
View File

@ -54,14 +54,12 @@ public class TbMsgToEmailNode implements TbNode {
private static final String IMAGES = "images"; private static final String IMAGES = "images";
private TbMsgToEmailNodeConfiguration config; private TbMsgToEmailNodeConfiguration config;
private boolean isDynamicHtmlTemplate = false; private boolean isDynamicHtmlTemplate;
@Override @Override
public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
this.config = TbNodeUtils.convert(configuration, TbMsgToEmailNodeConfiguration.class); this.config = TbNodeUtils.convert(configuration, TbMsgToEmailNodeConfiguration.class);
if(this.config.getMailBodyType().equals("dynamic")) { this.isDynamicHtmlTemplate = this.config.getMailBodyType().equals("dynamic");
this.isDynamicHtmlTemplate = true;
}
} }
@Override @Override

3
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNodeConfiguration.java
View File

@ -37,8 +37,7 @@ public class TbMsgToEmailNodeConfiguration implements NodeConfiguration {
configuration.toTemplate = "${userEmail}"; configuration.toTemplate = "${userEmail}";
configuration.subjectTemplate = "Device ${deviceType} temperature high"; configuration.subjectTemplate = "Device ${deviceType} temperature high";
configuration.bodyTemplate = "Device ${deviceName} has high temperature ${temp}"; configuration.bodyTemplate = "Device ${deviceName} has high temperature ${temp}";
configuration.isHtmlTemplate = "${isHtml}"; configuration.mailBodyType = "false";
configuration.mailBodyType = "dynamic";
return configuration; return configuration;
} }
} }

2
rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js
View File

File diff suppressed because one or more lines are too long