From 66213d151da19da403d103f2d835727b071a394d Mon Sep 17 00:00:00 2001
From: Anna Thomas <annat21@live.co.uk>
Date: Wed, 17 Dec 2014 13:35:57 +0000
Subject: [PATCH] No-op and return success on enabling/disabling node by type
 name

---
 red/api/nodes.js | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/red/api/nodes.js b/red/api/nodes.js
index fe9b19ac1..07b94edb0 100644
--- a/red/api/nodes.js
+++ b/red/api/nodes.js
@@ -142,10 +142,8 @@ module.exports = {
             var info;
             if (!node) {
                 res.send(404);
-            } else if (!node.err && node.enabled === body.enabled) {
-                res.json(node);
             } else {
-                res.json(putNode(id, body.enabled));
+                res.json(putNode(node, body.enabled));
             }
         } catch(err) {
             res.send(400,err.toString());
@@ -169,7 +167,7 @@ module.exports = {
                 var matching = getMatchingNodes(mod);
                 if (matching.length === 1) {
                     // One match, assume correct
-                    res.json(putNode(matching[0].id, body.enabled));
+                    res.json(putNode(matching[0], body.enabled));
                     return;
                 } else if (matching.length > 1) {
                     // Multiple matches, need clarification
@@ -229,24 +227,28 @@ function getMatchingNodes(node) {
     return matching;
 }
 
-function putNode(id, enabled) {
+function putNode(node, enabled) {
     var info;
 
-    if (enabled) {
-        info = redNodes.enableNode(id);
+    if (!node.err && node.enabled === enabled) {
+        info = node;
     } else {
-        info = redNodes.disableNode(id);
-    }
-
-    if (info.enabled === enabled && !info.err) {
-        comms.publish("node/"+(enabled?"enabled":"disabled"),info,false);
-        util.log("[red] "+(enabled?"Enabled":"Disabled")+" node types:");
-        for (var i=0;i<info.types.length;i++) {
-            util.log("[red] - "+info.types[i]);
+        if (enabled) {
+            info = redNodes.enableNode(node.id);
+        } else {
+            info = redNodes.disableNode(node.id);
+        }
+
+        if (info.enabled === enabled && !info.err) {
+            comms.publish("node/"+(enabled?"enabled":"disabled"),info,false);
+            util.log("[red] "+(enabled?"Enabled":"Disabled")+" node types:");
+            for (var i=0;i<info.types.length;i++) {
+                util.log("[red] - "+info.types[i]);
+            }
+        } else if (enabled && info.err) {
+            util.log("[red] Failed to enable node:");
+            util.log("[red] - "+info.name+" : "+info.err);
         }
-    } else if (enabled && info.err) {
-        util.log("[red] Failed to enable node:");
-        util.log("[red] - "+info.name+" : "+info.err);
     }
 
     return info;