Skip to content

Update rules.js #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update rules.js #287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Core/automation/lib/javascript/core/rules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,10 @@ return RuleBuilder.create(ruleDto.uid)
var ruid = uuid.randomUUID() + "-" + obj.name.replace(/[^\w]/g, "-");
logInfo("################ JSRule Line: "+__LINE__+" ################# ruid:" + ruid);
//var rule = new SimpleRule({ setUID: function(i) { uid = i; } })
var rule = new SimpleRule(){
var rule = new SimpleRule({
execute: obj.execute //DOES THIS WORK? AND IF YES, WHY? => execute is found in implemented SimpleRuleActionHandler
};
});

var triggers = obj.triggers ? obj.triggers : obj.getEventTrigger();

rule.setTemplateUID(ruid);
Expand Down Expand Up @@ -136,7 +137,7 @@ return RuleBuilder.create(ruleDto.uid)
var rname = obj.name ? obj.name.replace(/[^\w]/g, "-") : "nameless-generic";
var ruid = obj.uid ? obj.uid : uuid.randomUUID() + "-" + rname;
var triggers = obj.triggers ? obj.triggers : obj.getEventTrigger();
var execX = new SimpleRule(){execute: obj.execute};//Not good!!
var execX = new SimpleRule({execute: obj.execute});//Not good!!
return RuleBuilder.create(ruid)
.withActions(execX.getActions() ? execX.getActions() : null)
//.withActions(obj.execute ? [obj.execute] : null) //org.openhab.core.automation.module.script.rulesupport.shared.ScriptedAutomationManager L164
Expand Down