From 92d978dd9d9b15bab7b3852787c2ce094880f97d Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 15 Feb 2016 21:56:47 +0000
Subject: [PATCH] Eliminate from_editor param to simplify workflow manager...

... slightly.
---
 lib/galaxy/managers/workflows.py                  | 12 ++++++++----
 lib/galaxy/webapps/galaxy/controllers/workflow.py |  1 -
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py
index e15de6c6103..cab16d79b75 100644
--- a/lib/galaxy/managers/workflows.py
+++ b/lib/galaxy/managers/workflows.py
@@ -1,5 +1,7 @@
 from __future__ import absolute_import
 
+from six import string_types
+
 from collections import namedtuple
 import logging
 import json
@@ -239,15 +241,13 @@ class WorkflowContentsManager(UsesAnnotations):
             missing_tools=missing_tool_tups
         )
 
-    def update_workflow_from_dict(self, trans, stored_workflow, workflow_data, from_editor=False):
+    def update_workflow_from_dict(self, trans, stored_workflow, workflow_data):
         # Put parameters in workflow mode
         trans.workflow_building_mode = True
-        # Convert incoming workflow data from json if coming from editor
-        data = json.loads(workflow_data) if from_editor else workflow_data
 
         workflow, missing_tool_tups = self._workflow_from_dict(
             trans,
-            data,
+            workflow_data,
             name=stored_workflow.name,
         )
 
@@ -271,6 +271,10 @@ class WorkflowContentsManager(UsesAnnotations):
         return workflow, errors
 
     def _workflow_from_dict(self, trans, data, name):
+        if isinstance(data, string_types):
+            # If coming from the editor...
+            data = json.loads(data)
+
         # Create new workflow from source data
         workflow = model.Workflow()
 
diff --git a/lib/galaxy/webapps/galaxy/controllers/workflow.py b/lib/galaxy/webapps/galaxy/controllers/workflow.py
index 380b558f2a8..a8c4a7238aa 100644
--- a/lib/galaxy/webapps/galaxy/controllers/workflow.py
+++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py
@@ -707,7 +707,6 @@ class WorkflowController( BaseUIController, SharableMixin, UsesStoredWorkflowMix
                 trans,
                 stored,
                 workflow_data,
-                from_editor=True,
             )
         except workflows.MissingToolsException as e:
             return dict(