jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix ipv4 and ipv6 routes

Browse Source
This commit is contained in:
Girish Ramakrishnan
2022-02-15 12:51:06 -08:00
parent 7af69e080f
commit 41099c1131
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/network.js
View File

@@ -126,7 +126,6 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
error: {},
serverIPv4: '',
serverIPv6: '',
provider: '',
ipv4: '',
@@ -135,7 +134,6 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
// configure dialog
newProvider: '',
newIPv4: '',
newIPv6: '',
newIfname: '',
refresh: function () {
@@ -144,14 +142,12 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
$scope.sysinfo.provider = result.provider;
$scope.sysinfo.ipv4 = result.ipv4 || '';
$scope.sysinfo.ipv6 = result.ipv6 || '';
$scope.sysinfo.ifname = result.ifname || '';
Client.getServerIp(function (error, result) {
Client.getServerIpv4(function (error, result) {
if (error) return console.error(error);
$scope.sysinfo.serverIPv4 = result.ipv4;
$scope.sysinfo.serverIPv6 = result.ipv6 || '';
});
});
},
@@ -160,7 +156,6 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
$scope.sysinfo.error = {};
$scope.sysinfo.newProvider = $scope.sysinfo.provider;
$scope.sysinfo.newIPv4 = $scope.sysinfo.ipv4;
$scope.sysinfo.newIPv6 = $scope.sysinfo.ipv6;
$scope.sysinfo.newIfname = $scope.sysinfo.ifname;
$('#sysinfoModal').modal('show');
@@ -176,7 +171,6 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
if (config.provider === 'fixed') {
config.ipv4 = $scope.sysinfo.newIPv4;
if ($scope.ipv6Configure.isEnabled && $scope.sysinfo.newIPv6) config.ipv6 = $scope.sysinfo.newIPv6;
} else if (config.provider === 'network-interface') {
config.ifname = $scope.sysinfo.newIfname;
}
@@ -184,11 +178,7 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
Client.setSysinfoConfig(config, function (error) {
$scope.sysinfo.busy = false;
if (error && error.message.indexOf('ipv') !== -1) {
if (error.message.indexOf('ipv4') !== -1) {
$scope.sysinfo.error.ipv4 = error.message;
} else {
$scope.sysinfo.error.ipv6 = error.message;
}
$scope.sysinfo.error.ipv4 = error.message;
$scope.sysinfoForm.$setPristine();
$scope.sysinfoForm.$setUntouched();
return;