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

network: simply use ip instead of ipv4/ipv6

Browse Source 
this makes it simpler for openapi docs
This commit is contained in:
Girish Ramakrishnan
2023-09-12 20:13:27 +05:30
parent 58bf5ec677
commit 964dc990a6
4 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dashboard/src/views/network.js
View File

@@ -96,7 +96,7 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
}
$scope.ipv6Configure.provider = result.provider;
$scope.ipv6Configure.ipv6 = result.ipv6 || '';
$scope.ipv6Configure.ipv6 = result.ip || '';
$scope.ipv6Configure.ifname = result.ifname || '';
if (result.provider === 'noop') return;
@@ -106,7 +106,7 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
return console.error(error);
}
$scope.ipv6Configure.serverIPv6 = result.ipv6;
$scope.ipv6Configure.serverIPv6 = result.ip;
});
});
},
@@ -129,7 +129,7 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
};
if (config.provider === 'fixed') {
config.ipv6 = $scope.ipv6Configure.newIPv6;
config.ip = $scope.ipv6Configure.newIPv6;
} else if (config.provider === 'network-interface') {
config.ifname = $scope.ipv6Configure.newIfname;
}
@@ -269,13 +269,13 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
if (error) return console.error(error);
$scope.sysinfo.provider = result.provider;
$scope.sysinfo.ipv4 = result.ipv4 || '';
$scope.sysinfo.ipv4 = result.ip || '';
$scope.sysinfo.ifname = result.ifname || '';
Client.getServerIpv4(function (error, result) {
if (error) return console.error(error);
$scope.sysinfo.serverIPv4 = result.ipv4;
$scope.sysinfo.serverIPv4 = result.ip;
});
});
},
@@ -298,7 +298,7 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
};
if (config.provider === 'fixed') {
config.ipv4 = $scope.sysinfo.newIPv4;
config.ip = $scope.sysinfo.newIPv4;
} else if (config.provider === 'network-interface') {
config.ifname = $scope.sysinfo.newIfname;
}