Development

docker/routlin-dash/app/pages/bannedips/content.json

@@ -34,7 +34,7 @@
           "class": "col-mono"
         },
         {
-          "label": "Status",
+          "label": "Rule State",
           "field": "enabled",
           "render": "badge_enabled_disabled"
         }

docker/routlin-dash/app/pages/ddns/content.json

@@ -111,7 +111,7 @@
           "render": "tag_list"
         },
         {
-          "label": "Status",
+          "label": "Rule State",
           "field": "enabled",
           "render": "badge_enabled_disabled"
         },

docker/routlin-dash/app/pages/dhcpreservations/content.json

@@ -59,7 +59,7 @@
           "render": "badge_yes_no"
         },
         {
-          "label": "Rule Status",
+          "label": "Rule State",
           "field": "enabled",
           "render": "badge_enabled_disabled"
         }

docker/routlin-dash/app/pages/hostoverrides/content.json

@@ -34,7 +34,7 @@
           "class": "col-mono"
         },
         {
-          "label": "Status",
+          "label": "Rule State",
           "field": "enabled",
           "render": "badge_enabled_disabled"
         }

docker/routlin-dash/app/pages/intervlan/content.json

@@ -49,7 +49,7 @@
           "class": "col-mono col-narrow"
         },
         {
-          "label": "Status",
+          "label": "Rule State",
           "field": "enabled",
           "render": "badge_enabled_disabled"
         }

docker/routlin-dash/app/pages/networklayout/action.py

@@ -276,6 +276,8 @@ def vlans_addedit():
         else:
             existing.pop('dhcp_information', None)
 
+        for desc in validate.disable_portfwd_on_restricted_vlans(cfg):
+            flash(f"Port forwarding rule '{desc}' was disabled because its destination is on a restricted VLAN.", 'info')
         errors = validate.validate_config(cfg)
         if errors:
             for msg in errors:
@@ -338,6 +340,8 @@ def vlans_addedit():
             entry['reservations'] = []
         vlans.append(entry)
 
+        for desc in validate.disable_portfwd_on_restricted_vlans(cfg):
+            flash(f"Port forwarding rule '{desc}' was disabled because its destination is on a restricted VLAN.", 'info')
         errors = validate.validate_config(cfg)
         if errors:
             for msg in errors:

docker/routlin-dash/app/pages/portforwarding/action.py

@@ -85,6 +85,8 @@ def addrule_add():
 
     cfg = load_config()
     cfg.setdefault('port_forwarding', []).append(entry)
+    for desc in validate.disable_portfwd_on_restricted_vlans(cfg):
+        flash(f"Port forwarding rule '{desc}' was disabled because its destination is on a restricted VLAN.", 'info')
     errors = validate.validate_config(cfg)
     if errors:
         for msg in errors:
@@ -116,6 +118,8 @@ def rules_toggle():
     old_enabled        = items[idx].get('enabled', True)
     before             = copy.deepcopy(items[idx])
     items[idx]['enabled'] = not old_enabled
+    for desc in validate.disable_portfwd_on_restricted_vlans(cfg):
+        flash(f"Port forwarding rule '{desc}' was disabled because its destination is on a restricted VLAN.", 'info')
     errors = validate.validate_config(cfg)
     if errors:
         for msg in errors:
@@ -151,6 +155,8 @@ def rules_edit():
     before        = copy.deepcopy(items[idx])
     items[idx]    = entry
     items[idx]['enabled'] = request.form.get('enabled') == 'on'
+    for desc in validate.disable_portfwd_on_restricted_vlans(cfg):
+        flash(f"Port forwarding rule '{desc}' was disabled because its destination is on a restricted VLAN.", 'info')
     errors = validate.validate_config(cfg)
     if errors:
         for msg in errors:

docker/routlin-dash/app/pages/portforwarding/content.json

@@ -44,7 +44,7 @@
           "class": "col-mono"
         },
         {
-          "label": "Status",
+          "label": "Rule State",
           "field": "enabled",
           "render": "badge_enabled_disabled"
         }

docker/routlin-dash/app/pages/portwrangling/content.json

@@ -54,7 +54,7 @@
           "class": "col-mono"
         },
         {
-          "label": "Status",
+          "label": "Rule State",
           "field": "enabled",
           "render": "badge_enabled_disabled"
         }