added option to map default to another value in current data entry

This commit is contained in:
Tomaae 2019-12-11 08:40:40 +01:00
parent 477dd630d8
commit dfb2abd1af
2 changed files with 4 additions and 4 deletions

View file

@ -60,6 +60,9 @@ async def from_list(data=None, source=None, key=None, vals=[], ensure_vals=[]):
if _type == 'str': if _type == 'str':
_default = val['default'] if 'default' in val else '' _default = val['default'] if 'default' in val else ''
if 'default_val' in val and val['default_val'] in val:
_default = val[val['default_val']]
data[uid][_name] = from_entry(entry, _source, default=_default) data[uid][_name] = from_entry(entry, _source, default=_default)
elif _type == 'bool': elif _type == 'bool':
_default = val['default'] if 'default' in val else False _default = val['default'] if 'default' in val else False

View file

@ -171,7 +171,7 @@ class MikrotikControllerData():
key='default-name', key='default-name',
vals=[ vals=[
{'name': 'default-name'}, {'name': 'default-name'},
{'name': 'name'}, {'name': 'name', 'default_val': 'default-name'},
{'name': 'type', 'default': 'unknown'}, {'name': 'type', 'default': 'unknown'},
{'name': 'running', 'type': 'bool'}, {'name': 'running', 'type': 'bool'},
{'name': 'enabled', 'source': 'disabled', 'type': 'bool', 'reverse': True}, {'name': 'enabled', 'source': 'disabled', 'type': 'bool', 'reverse': True},
@ -193,9 +193,6 @@ class MikrotikControllerData():
interface_list = "" interface_list = ""
for uid in self.data['interface']: for uid in self.data['interface']:
if not self.data['interface'][uid]['name']:
self.data['interface'][uid]['name'] = self.data['interface'][uid]['default-name']
self.data['interface_map'][self.data['interface'][uid]['name']] = self.data['interface'][uid]['default-name'] self.data['interface_map'][self.data['interface'][uid]['name']] = self.data['interface'][uid]['default-name']
if interface_list: if interface_list: