diff --git a/docker/routlin-dash/app/pages/clientcredentials/content.json b/docker/routlin-dash/app/pages/clientcredentials/content.json index 3887d34..1dd5ccb 100644 --- a/docker/routlin-dash/app/pages/clientcredentials/content.json +++ b/docker/routlin-dash/app/pages/clientcredentials/content.json @@ -138,7 +138,7 @@ }, { "type": "raw_html", - "html": "" + "html": "" }, { "type": "field", diff --git a/docker/routlin-dash/app/pages/clientcredentials/view.py b/docker/routlin-dash/app/pages/clientcredentials/view.py index 5b611c4..f107178 100644 --- a/docker/routlin-dash/app/pages/clientcredentials/view.py +++ b/docker/routlin-dash/app/pages/clientcredentials/view.py @@ -68,16 +68,16 @@ def collect_tokens(cfg): 'Client Credentials is a Routlin Pro feature. ' 'Credentials can be viewed but not added or edited without a Pro license.' ) - tokens['ADD_CREDENTIAL_DISABLED'] = '' if PRO_LICENSE else 'true' + tokens['ADD_CREDENTIAL_DISABLED'] = 'true' vlans = [v for v in cfg.get('vlans', []) if not v.get('is_vpn')] tokens['VLAN_OPTIONS'] = json.dumps( - [{'value': '', 'label': '— Select VLAN —'}] + + [{'value': '', 'label': '- Select VLAN -'}] + [{'value': v['name'], 'label': f"{v['name']} (VLAN {v['vlan_id']})"} for v in vlans] ) captive_vlans = [v for v in cfg.get('vlans', []) if v.get('restricted_vlan') == 'c'] tokens['CAPTIVE_VLAN_OPTIONS'] = json.dumps( - [{'value': '', 'label': '— Select VLAN —'}] + + [{'value': '', 'label': '- Select VLAN -'}] + [{'value': v['name'], 'label': f"{v['name']} (VLAN {v['vlan_id']})"} for v in captive_vlans] )