Skip to content
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

Jump to bottom

Fix Dict/Unicode bug #3475

Merged
merged 2 commits into from
Oct 28, 2019
Merged

Fix Dict/Unicode bug #3475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28f2c52
fix json-unicode bug with ast.literal_eval
ilan-gold Oct 23, 2019
b41142f
remove type checking and refresh from db
ilan-gold Oct 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions refinery/core/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,9 +1067,9 @@ def __str__(self):
self.summary)

def get_expanded_workflow_graph(self):
return tool_manager.utils.create_expanded_workflow_graph(
ast.literal_eval(self.workflow_copy)
)
self.refresh_from_db(fields=['workflow_copy'])
workflow_copy = ast.literal_eval(self.workflow_copy)
return tool_manager.utils.create_expanded_workflow_graph(workflow_copy)

def has_nodes_used_in_downstream_analyses(self):
"""
Expand Down
3 changes: 2 additions & 1 deletion refinery/tool_manager/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,8 @@ def _get_tool_inputs_dict(self, workflow_step):
def _get_workflow_dict(self):
# separate if-then assignment needed to avoid using the dict stored
# in workflow_copy before .save() is called
if self.analysis.workflow_copy == '' \
self.analysis.refresh_from_db(fields=['workflow_copy'])
if self.analysis.workflow_copy == u'' \
or self.analysis.workflow_copy is None:
workflow_copy = \
self.galaxy_connection.workflows.export_workflow_dict(
Expand Down