From f71cc31c5bcc8cdaa37455665c52acc90122f1e0 Mon Sep 17 00:00:00 2001
From: Yago Diaz <yagodiazotero@gmail.com>
Date: Fri, 15 May 2026 10:40:48 +0200
Subject: [PATCH 1/3] Add Cancel and back buttons needed

closes #2327
---
 public/js/admin.js                     | 6 ++++--
 templates/main/admin_group.html.ep     | 7 +++++++
 templates/main/network_options.html.ep | 2 ++
 templates/main/route_options.html.ep   | 2 ++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/public/js/admin.js b/public/js/admin.js
index 4225d2a32..bfe269e2b 100644
--- a/public/js/admin.js
+++ b/public/js/admin.js
@@ -26,7 +26,7 @@ ravadaApp.directive("solShowMachine", swMach)
         return {
             require: 'ngModel',
             link: function(scope, elm, attrs, ctrl) {
-                ctrl.$parsers.unshift(function(inputText) {
+                function validateIP(inputText) {
                     var ipformat = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/([0-9]|[0-1][0-9]|2[0-4])$/;
                     if(ipformat.test(inputText))
                     {
@@ -40,8 +40,10 @@ ravadaApp.directive("solShowMachine", swMach)
                         ctrl.$setValidity('ipformat', false);
                         return undefined;
                     }
-                });
+                }
 
+                ctrl.$parsers.unshift(validateIP);
+                ctrl.$formatters.unshift(validateIP);
             }
         };
     });
diff --git a/templates/main/admin_group.html.ep b/templates/main/admin_group.html.ep
index 2e29edc3d..1c6c485fd 100644
--- a/templates/main/admin_group.html.ep
+++ b/templates/main/admin_group.html.ep
@@ -11,6 +11,8 @@
             <div class="page-header">
               <div class="card" id="admin-content">
                 <div class="card-header">
+                    <div class="row">
+                    <div class="col-10">
                     <h2 class="display-5"><%=l 'Group' %> <%= $group_name %></h2>
 %                  if ($type eq 'ldap') {
 LDAP
@@ -19,6 +21,11 @@ LDAP
                     <br/>
                     <%=l 'dn:' %> <b><%= $group->dn %></b>
 % }
+                    </div>
+                    <div class="col-2" align="right">
+                        <button type="reset" class="btn btn-outline-secondary" onclick = "location='/admin/groups'"><%=l 'back' %></button>
+                    </div>
+                    </div>
                 </div>
               </div>
             </div>
diff --git a/templates/main/network_options.html.ep b/templates/main/network_options.html.ep
index 3606e67b6..746f455e3 100644
--- a/templates/main/network_options.html.ep
+++ b/templates/main/network_options.html.ep
@@ -130,6 +130,8 @@
     <div class="col-md-4" align="left">
         <button ng-show="network.id" class="btn btn-outline-secondary"
             ng-click="load_network(network.id)"><%=l 'Cancel' %></button>
+        <button ng-show="!network.id" class="btn btn-outline-secondary"
+            onclick="location='/admin/networks'"><%=l 'Cancel' %></button>
         <button class="btn btn-primary"
             ng-disabled="form_network.$pristine"
             ng-click="update_network()"
diff --git a/templates/main/route_options.html.ep b/templates/main/route_options.html.ep
index 910c7daa5..96169b2c0 100644
--- a/templates/main/route_options.html.ep
+++ b/templates/main/route_options.html.ep
@@ -68,6 +68,8 @@
         <button ng-show="route.id" class="btn btn-outline-secondary"
             ng-disabled="formNetwork.$pristine"
         ng-click="load_network(route.id)"><%=l 'Cancel' %></button>
+        <button ng-show="!route.id" class="btn btn-outline-secondary"
+        onclick="location='/admin/routes'"><%=l 'Cancel' %></button>
         <button
             class="btn btn-primary"
             ng-click="update_network()"

From 9c6914ae6b388b7af7326b7c7f167e96a2196c65 Mon Sep 17 00:00:00 2001
From: Yago Diaz <yagodiazotero@gmail.com>
Date: Mon, 18 May 2026 10:41:41 +0200
Subject: [PATCH 2/3] fix: fixes validateIP formater interaction

issue #2327
---
 public/js/admin.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/public/js/admin.js b/public/js/admin.js
index bfe269e2b..d1c1aaf73 100644
--- a/public/js/admin.js
+++ b/public/js/admin.js
@@ -26,7 +26,7 @@ ravadaApp.directive("solShowMachine", swMach)
         return {
             require: 'ngModel',
             link: function(scope, elm, attrs, ctrl) {
-                function validateIP(inputText) {
+                function validateIP(inputText, isParser) {
                     var ipformat = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/([0-9]|[0-1][0-9]|2[0-4])$/;
                     if(ipformat.test(inputText))
                     {
@@ -38,12 +38,17 @@ ravadaApp.directive("solShowMachine", swMach)
                         //alert("You have entered an invalid IP address!");
                         //document.form1.text1.focus();
                         ctrl.$setValidity('ipformat', false);
-                        return undefined;
+                        return isParser ? undefined : inputText;
                     }
                 }
 
-                ctrl.$parsers.unshift(validateIP);
-                ctrl.$formatters.unshift(validateIP);
+                ctrl.$parsers.unshift(function(value) {
+                    return validateIP(value, true);
+                });
+
+                ctrl.$formatters.unshift(function(value) {
+                    return validateIP(value, false);
+                });
             }
         };
     });

From a0671b5e216fbc1572231b01c5e3f20edd21af67 Mon Sep 17 00:00:00 2001
From: Yago Diaz <yagodiazotero@gmail.com>
Date: Tue, 19 May 2026 10:35:51 +0200
Subject: [PATCH 3/3] fix button type declaration

issue #2327
---
 templates/main/network_options.html.ep | 4 ++--
 templates/main/route_options.html.ep   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/main/network_options.html.ep b/templates/main/network_options.html.ep
index 746f455e3..1ffe417a9 100644
--- a/templates/main/network_options.html.ep
+++ b/templates/main/network_options.html.ep
@@ -128,9 +128,9 @@
 <div class="form-group row">
     <div class="col-md-3" align="right"></div>
     <div class="col-md-4" align="left">
-        <button ng-show="network.id" class="btn btn-outline-secondary"
+        <button type="button" ng-show="network.id" class="btn btn-outline-secondary"
             ng-click="load_network(network.id)"><%=l 'Cancel' %></button>
-        <button ng-show="!network.id" class="btn btn-outline-secondary"
+        <button type="button" ng-show="!network.id" class="btn btn-outline-secondary"
             onclick="location='/admin/networks'"><%=l 'Cancel' %></button>
         <button class="btn btn-primary"
             ng-disabled="form_network.$pristine"
diff --git a/templates/main/route_options.html.ep b/templates/main/route_options.html.ep
index 96169b2c0..6ecd00b4c 100644
--- a/templates/main/route_options.html.ep
+++ b/templates/main/route_options.html.ep
@@ -65,10 +65,10 @@
 <div class="row">
     <div class="col-md-3" align="right"></div>
     <div class="col-md-4" align="left">
-        <button ng-show="route.id" class="btn btn-outline-secondary"
+        <button type="button" ng-show="route.id" class="btn btn-outline-secondary"
             ng-disabled="formNetwork.$pristine"
         ng-click="load_network(route.id)"><%=l 'Cancel' %></button>
-        <button ng-show="!route.id" class="btn btn-outline-secondary"
+        <button type="button" ng-show="!route.id" class="btn btn-outline-secondary"
         onclick="location='/admin/routes'"><%=l 'Cancel' %></button>
         <button
             class="btn btn-primary"