From ecc65ac4604eeca2d7b30e894216dc1a24c149dc Mon Sep 17 00:00:00 2001
From: baigner <benedikt.aigner@rwth-aachen.de>
Date: Wed, 11 Apr 2018 10:37:54 +0200
Subject: [PATCH] Fixed issues with saving and uploading mdpg
Former-commit-id: ac673f522c959169e94cef89e87a001c15a098b3
---
kadmos/vistoms/vistoms.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kadmos/vistoms/vistoms.py b/kadmos/vistoms/vistoms.py
index e4e5ab44c..501974dd5 100644
--- a/kadmos/vistoms/vistoms.py
+++ b/kadmos/vistoms/vistoms.py
@@ -124,11 +124,11 @@ def kadmosUploadFile():
# Use function order for VISTOMS if it is available in the graph information
function_order = None
- if graph.graph_has_nested_attributes('problem_formulation', 'function_order'):
+ if graph.graph_has_nested_attributes('problem_formulation', 'function_order') and mpg==None:
function_order = graph.graph['problem_formulation']['function_order']
# Add the graph with the updated function order to VISTOMS
- newVistomsData = graph.vistoms_add_json(graph_id=newGraphID, mpg=mpg, function_order=function_order)
+ newVistomsData = graph.vistoms_add_json(graph_id=newGraphID, function_order=function_order, mpg=mpg)
return newVistomsData
@@ -378,7 +378,7 @@ def kadmosFindTempGraphs():
# Use function order for VISTOMS if it is available in the graph information
function_order = None
- if graph.graph_has_nested_attributes('problem_formulation', 'function_order'):
+ if graph.graph_has_nested_attributes('problem_formulation', 'function_order') and mpg == None:
function_order = graph.graph['problem_formulation']['function_order']
graph.save(os.path.join(UPLOAD_FOLDER, graphFileName), file_type="kdms",
--
GitLab