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

Merge branch 'develop' into coretk-fix

Browse source
This commit is contained in:
Huy Pham 2020-01-20 09:12:17 -08:00
commit 8bcacf0a04
8 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/core/xml/corexml.py
View file

@ -762,7 +762,9 @@ class CoreXmlReader:
node_id = get_int(device_element, "id") node_id = get_int(device_element, "id")
name = device_element.get("name") name = device_element.get("name")
model = device_element.get("type") model = device_element.get("type")
icon = device_element.get("icon")
options = NodeOptions(name, model) options = NodeOptions(name, model)
options.icon = icon
service_elements = device_element.find("services") service_elements = device_element.find("services")
if service_elements is not None: if service_elements is not None:
@ -788,7 +790,9 @@ class CoreXmlReader:
node_id = get_int(network_element, "id") node_id = get_int(network_element, "id")
name = network_element.get("name") name = network_element.get("name")
node_type = NodeTypes[network_element.get("type")] node_type = NodeTypes[network_element.get("type")]
icon = network_element.get("icon")
options = NodeOptions(name) options = NodeOptions(name)
options.icon = icon
position_element = network_element.find("position") position_element = network_element.find("position")
if position_element is not None: if position_element is not None: