Skip to content

Add Cancel and back buttons needed #2328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frankiejol merged 3 commits into from
May 19, 2026
Merged

Add Cancel and back buttons needed #2328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f71cc31
Add Cancel and back buttons needed
Yago004 May 15, 2026
9c6914a
fix: fixes validateIP formater interaction
Yago004 May 18, 2026
a0671b5
fix button type declaration
Yago004 May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions public/js/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, 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))
{
Expand All @@ -38,10 +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;
Comment on lines 29 to +41
}
}

ctrl.$parsers.unshift(function(value) {
return validateIP(value, true);
});

ctrl.$formatters.unshift(function(value) {
return validateIP(value, false);
});
}
};
});
Expand Down
7 changes: 7 additions & 0 deletions templates/main/admin_group.html.ep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion templates/main/network_options.html.ep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,10 @@
<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 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"
ng-click="update_network()"
Expand Down
4 changes: 3 additions & 1 deletion templates/main/route_options.html.ep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@
<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 type="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()"
Expand Down
Loading