Development
This commit is contained in:
parent
f237c69307
commit
9b6543a4bf
1 changed files with 6 additions and 3 deletions
|
|
@ -306,7 +306,8 @@ def _config_datasource(name):
|
||||||
{'n': bl, 'd': bl_desc.get(bl, bl)} for bl in v.get('use_blocklists', [])
|
{'n': bl, 'd': bl_desc.get(bl, bl)} for bl in v.get('use_blocklists', [])
|
||||||
])
|
])
|
||||||
row['server_identity_ips'] = json.dumps([
|
row['server_identity_ips'] = json.dumps([
|
||||||
s.get('ip', '') for s in v.get('server_identities', []) if s.get('ip')
|
{'n': s['ip'], 'd': s['ip'], 'short': s['ip'].rsplit('.', 1)[-1], 'mini': s['ip'].rsplit('.', 1)[-1]}
|
||||||
|
for s in v.get('server_identities', []) if s.get('ip')
|
||||||
])
|
])
|
||||||
rows.append(row)
|
rows.append(row)
|
||||||
return rows
|
return rows
|
||||||
|
|
@ -1702,12 +1703,14 @@ def _render_table_cell(value, render_fn, col_class='', field='', row_idx=None,
|
||||||
def _tag(t):
|
def _tag(t):
|
||||||
if isinstance(t, dict):
|
if isinstance(t, dict):
|
||||||
s, tooltip = str(t.get('n', '')).strip(), str(t.get('d', t.get('n', ''))).strip()
|
s, tooltip = str(t.get('n', '')).strip(), str(t.get('d', t.get('n', ''))).strip()
|
||||||
|
short = str(t['short']).strip() if 'short' in t else s.split('-')[0]
|
||||||
|
mini = str(t['mini']).strip() if 'mini' in t else (s[0] if s else '')
|
||||||
else:
|
else:
|
||||||
s = tooltip = str(t).strip()
|
s = tooltip = str(t).strip()
|
||||||
|
short = s.split('-')[0]
|
||||||
|
mini = s[0] if s else ''
|
||||||
if not s:
|
if not s:
|
||||||
return ''
|
return ''
|
||||||
short = s.split('-')[0]
|
|
||||||
mini = s[0]
|
|
||||||
return (
|
return (
|
||||||
f'<span class="tag" data-tooltip="{e(tooltip)}">'
|
f'<span class="tag" data-tooltip="{e(tooltip)}">'
|
||||||
f'<span class="tl-full">{e(s)}</span>'
|
f'<span class="tl-full">{e(s)}</span>'
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue