Browse Source

Join front-end

pull/4429/head
AndrewVolosytnykhThingsboard 6 years ago
parent
commit
8281609df0
  1. 6
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
  2. 3
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNodeConfiguration.java
  3. 2
      rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js

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

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

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

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

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

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save