浏览代码

Set errorflag on both conflicting nodes

+ check both for "shareable"
dds
Frank Bösing 5 年前
父节点
当前提交
dbee3c0677
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. +3
    -1
      gui/red/ui/view.js

+ 3
- 1
gui/red/ui/view.js 查看文件

@@ -1024,14 +1024,16 @@ RED.view = (function() {
if (n2 != d && n2.requirements != null ) {
n2.requirements.forEach(function(r2) {
if (r["resource"] == r2["resource"]) {
if (r["shareable"] == false) {
if (r["shareable"] == false || r2["shareable"] == false) {
console.log("Conflict: shareable '"+r["resource"]+"' "+d.name+" and "+n2.name);
d.requirementError = true;
r2.requirementError = true;
}
else
if (r["setting"] != r2["setting"]) {
console.log("Conflict: "+ d.name + " setting['"+r["setting"]+"'] and "+n2.name+" setting['"+r2["setting"]+"']");
d.requirementError = true;
r2.requirementError = true;
}
}
});

正在加载...
取消
保存