Bug Fix: Non-admins updating workflows cause admin-locked text fields to reset to defaults. Fixes #136 (again).

Author: jhuckaby

lib/api/events.js

@@ -280,7 +280,7 @@ class Events {
 			}
 			else if (is_workflow && !privs.admin) {
 				// for workflows, if user is non-admin we need to default the locked params of all event and job nodes
-				self.applyDefaultWorkflowNodeParams(params);
+				self.applyDefaultWorkflowNodeParams(params, event);
 			}
 
 			// allow api to update state for each event (e.g. cursor)
@@ -1065,32 +1065,44 @@ class Events {
 		return true;
 	}
 
-	applyDefaultWorkflowNodeParams(params) {
+	applyDefaultWorkflowNodeParams(params, orig_event) {
 		// for workflows, we need to apply defaults for all locked params of all event and job nodes
 		// this assumes the current user is not an admin
 		var self = this;
 		if (!params.workflow || !params.workflow.nodes) return;
 
 		params.workflow.nodes.forEach( function(node) {
+			var orig_node = (orig_event && orig_event.workflow && orig_event.workflow.nodes) ? 
+				Tools.findObject(orig_event.workflow.nodes, { id: node.id }) : null;
+			
 			if (node.type == 'event') {
 				// apply defaults for locked event + plugin params, if user is not an admin
 				var event = Tools.findObject(self.events, { id: node.data.event });
 				if (!event) return;
 
 				if (event.fields) event.fields.forEach( function(field) {
-					if (field.locked) node.data.params[ field.id ] = field.value;
+					if (!field.locked) return;
+					
+					node.data.params[ field.id ] = (orig_node && orig_node.data && orig_node.data.params && (field.id in orig_node.data.params)) ? 
+						orig_node.data.params[field.id] : field.value;
 				} );
 
 				var plugin = Tools.findObject(self.plugins, { id: event.plugin });
 				if (plugin && plugin.params) plugin.params.forEach( function(param) {
-					if (param.locked) node.data.params[ param.id ] = param.value;
+					if (!param.locked) return;
+					
+					node.data.params[ param.id ] = (orig_node && orig_node.data && orig_node.data.params && (param.id in orig_node.data.params)) ? 
+						orig_node.data.params[param.id] : param.value;
 				} );
 			}
 			else if (node.type == 'job') {
 				// apply defaults for locked plugin params, if user is not an admin
 				var plugin = Tools.findObject(self.plugins, { id: node.data.plugin });
 				if (plugin && plugin.params) plugin.params.forEach( function(param) {
-					if (param.locked) node.data.params[ param.id ] = param.value;
+					if (!param.locked) return;
+					
+					node.data.params[ param.id ] = (orig_node && orig_node.data && orig_node.data.params && (param.id in orig_node.data.params)) ? 
+						orig_node.data.params[param.id] : param.value;
 				} );
 			}
 		}); // foreach node