From ebda1cd4a6375affa49a86143f8ff47162f3c00a Mon Sep 17 00:00:00 2001 From: Matthew Grotke Date: Mon, 1 Jun 2026 02:12:38 -0400 Subject: [PATCH] Development --- docker/routlin-dash/app/pages/dhcp/content.json | 11 ++++++++--- .../app/pages/portwrangling/content.json | 14 +++++++++++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/docker/routlin-dash/app/pages/dhcp/content.json b/docker/routlin-dash/app/pages/dhcp/content.json index 59c8647..837f31d 100644 --- a/docker/routlin-dash/app/pages/dhcp/content.json +++ b/docker/routlin-dash/app/pages/dhcp/content.json @@ -118,7 +118,10 @@ { "col": "ip", "input_type": "text", - "validate": "VALIDATION_ADDRESS" + "validate": "VALIDATION_ADDRESS", + "attrs": { + "data-vlan-subnets": "%VLAN_SUBNET_INFO_JSON%" + } }, { "col": "radius_client", @@ -192,12 +195,14 @@ "label": "IP Address", "name": "ip", "input_type": "text", - "validate": "VALIDATION_IPV4_FORMAT", + "validate": "VALIDATION_IPV4_FORMAT|VALIDATION_ADDRESS", "optional": true, "placeholder": "e.g. 192.168.10.50", "hint": "Leave blank to authorize device on this VLAN dynamically.", "attrs": { - "data-res-ips-by-vlan": "%RESERVATION_IPS_BY_VLAN_JSON%" + "data-res-ips-by-vlan": "%RESERVATION_IPS_BY_VLAN_JSON%", + "data-vlan-subnets": "%VLAN_SUBNET_INFO_JSON%", + "data-vlan-select": "vlan_name" } }, { diff --git a/docker/routlin-dash/app/pages/portwrangling/content.json b/docker/routlin-dash/app/pages/portwrangling/content.json index 8a700d6..306fe2a 100644 --- a/docker/routlin-dash/app/pages/portwrangling/content.json +++ b/docker/routlin-dash/app/pages/portwrangling/content.json @@ -82,7 +82,11 @@ }, { "col": "redirect_to", - "input_type": "text" + "input_type": "text", + "validate": "VALIDATION_ADDRESS", + "attrs": { + "data-vlan-subnets": "%VLAN_SUBNET_INFO_JSON%" + } }, { "col": "enabled", @@ -152,8 +156,12 @@ "label": "Redirect To", "name": "redirect_to", "input_type": "text", - "validate": "VALIDATION_IPV4_FORMAT", - "placeholder": "e.g. 192.168.1.1" + "validate": "VALIDATION_IPV4_FORMAT|VALIDATION_ADDRESS", + "placeholder": "e.g. 192.168.1.1", + "attrs": { + "data-vlan-subnets": "%VLAN_SUBNET_INFO_JSON%", + "data-vlan-select": "vlan_name" + } } ] },