From ca2091a98b2f60520e21f0283a111483d88eea23 Mon Sep 17 00:00:00 2001
From: Matthew Grotke <mgrotke@gmail.com>
Date: Wed, 27 May 2026 03:23:55 -0400
Subject: [PATCH] Development

---
 .../routlin-dash/app/action_networklayout.py  | 19 +------------------
 docker/routlin-dash/app/view_page.py          |  3 ---
 docker/routlin-dash/data/page_content.json    |  3 +--
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/docker/routlin-dash/app/action_networklayout.py b/docker/routlin-dash/app/action_networklayout.py
index 0776da6..371a1a6 100644
--- a/docker/routlin-dash/app/action_networklayout.py
+++ b/docker/routlin-dash/app/action_networklayout.py
@@ -199,17 +199,6 @@ def networklayout_tablevlans_edit():
             entry.pop('hostname', None)
         new_identities.append(entry)
 
-    gateway_override = 'gateway_override' in request.form
-    gateway_raw      = sanitize.ip(request.form.get('gateway', ''))
-    if gateway_override:
-        if not gateway_raw:
-            flash('Gateway IP is required when override is enabled.', 'error')
-            return redirect(VIEW)
-        if gateway_raw not in identity_ips:
-            flash(f"Gateway '{gateway_raw}' must match one of the server identity IPs.", 'error')
-            return redirect(VIEW)
-
-    _existing_gateway = existing.get('dhcp_information', {}).get('explicit_overrides', {}).get('gateway', '')
     _ids_unchanged = (
         len(new_identities) == len(old_identities) and
         all(
@@ -226,8 +215,7 @@ def networklayout_tablevlans_edit():
             and radius_default      == bool(existing.get('radius_default', False))
             and mdns_reflection     == bool(existing.get('mdns_reflection', False))
             and sorted(use_blocklists) == sorted(existing.get('use_blocklists', []))
-            and _ids_unchanged
-            and (gateway_raw if gateway_override else '') == _existing_gateway):
+            and _ids_unchanged):
         flash('No changes were made.', 'info')
         return redirect(VIEW)
 
@@ -243,11 +231,6 @@ def networklayout_tablevlans_edit():
         'use_blocklists':      use_blocklists,
         'server_identities':   new_identities,
     })
-    dhcp_overrides = existing.setdefault('dhcp_information', {}).setdefault('explicit_overrides', {})
-    if gateway_override:
-        dhcp_overrides['gateway'] = gateway_raw
-    else:
-        dhcp_overrides.pop('gateway', None)
     errors = validate.validate_config(cfg)
     if errors:
         for msg in errors:
diff --git a/docker/routlin-dash/app/view_page.py b/docker/routlin-dash/app/view_page.py
index 103835b..18ef05d 100644
--- a/docker/routlin-dash/app/view_page.py
+++ b/docker/routlin-dash/app/view_page.py
@@ -322,9 +322,6 @@ def _config_datasource(name):
             row['server_identity_hostnames'] = json.dumps([
                 s.get('hostname', '') for s in v.get('server_identities', []) if s.get('ip')
             ])
-            row['server_identity_gateway'] = (
-                v.get('dhcp_information', {}).get('explicit_overrides', {}).get('gateway', '')
-            )
             rows.append(row)
         return rows
 
diff --git a/docker/routlin-dash/data/page_content.json b/docker/routlin-dash/data/page_content.json
index e4d88f5..18cf3d5 100644
--- a/docker/routlin-dash/data/page_content.json
+++ b/docker/routlin-dash/data/page_content.json
@@ -1585,8 +1585,7 @@
                   "pair_label": "Description (Opt)",
                   "pair_col2": "server_identity_hostnames",
                   "pair_label2": "Hostname (Opt)",
-                  "pair_validate2": "networkname",
-                  "gateway_col": "server_identity_gateway"
+                  "pair_validate2": "networkname"
                 },
                 {
                   "col": "radius_default",