afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

web app, further cleanup to javascript ui

Browse source
This commit is contained in:
Blake J. Harnden 2018-05-16 08:47:41 -07:00
parent c989d809cb
commit b15b838555
2 changed files with 88 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

6
webapp/app.py
View file

@ -169,6 +169,7 @@ def get_session(session_id):
nodes = []
for node in session.objects.itervalues():
services = [x._name for x in getattr(node, "services", [])]
nodes.append({
"id": node.objid,
"name": node.name,
@ -179,7 +180,7 @@ def get_session(session_id):
"y": node.position.y,
"z": node.position.z
},
"services": [x._name for x in node.services],
"services": services,
"url": "/sessions/%s/nodes/%s" % (session_id, node.objid)
})
@ -276,10 +277,11 @@ def get_node(session_id, node_id):
"flowid": interface.flow_id
})
services = [x._name for x in getattr(node, "services", [])]
return jsonify(
name=node.name,
type=nodeutils.get_node_type(node.__class__).value,
services=[x._name for x in node.services],
services=services,
model=node.type,
interfaces=interfaces,
linksurl="/sessions/%s/nodes/%s/links" % (session_id, node.objid)