GitHub-Mirror/dobin-lxd-webgui
0
0
Fork 0
mirror of https://github.com/dobin/lxd-webgui synced 2025-10-05 23:52:43 +02:00
Code Issues Releases Wiki Activity

fix settings page so it is displayed when there is no conenction to the server

Browse Source
This commit is contained in:
dobin
2016-05-16 14:54:22 +02:00
parent c31ddd9dbf
commit 23ac09b594
2 changed files with 129 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
modules/setting/SettingController.js
View File

@@ -7,12 +7,9 @@ angular.module('myApp.setting', ['ngRoute'])
templateUrl: 'modules/setting/settings.html',
controller: 'settingListCtrl',
resolve: {
myconfig: function(SettingServices, $route) {
return SettingServices.getMyCfg();
},
config: function(SettingServices, $route) {
return SettingServices.getConfig();
}
myconfig: function(SettingServices, $route) {
return SettingServices.getMyCfg();
},
}
})
;
@@ -20,36 +17,43 @@ angular.module('myApp.setting', ['ngRoute'])
.controller('settingListCtrl', function ($scope, $routeParams, $filter, $location, $uibModal, $window,
SettingServices, myconfig, config)
SettingServices, myconfig)
{
$scope.myconfig = myconfig;
$scope.config = config.data.metadata;
$scope.test = {};
$scope.testUrl = SettingServices.getLxdApiUrl();
$scope.myconfig = myconfig;
$scope.test = {};
$scope.testUrl = SettingServices.getLxdApiUrl();
$scope.save = function() {
SettingServices.setMyCfg($scope.myconfig);
}
$scope.testLxd = function() {
SettingServices.testLxd().then(function(data) {
$scope.test.lxd = "Success";
// Try to get config
SettingServices.getConfig().then(function(data) {
$scope.config = data.data.metadata;
}, function(error) {
$scope.test.lxd = "Fail";
})
}
$scope.errMsg = "Could not get config from server: " + SettingServices.getLxdUrl();
});
$scope.testLxdAuth = function() {
SettingServices.testLxdAuth().then(function(data) {
$scope.test.lxdAuth = "Auth Success";
}, function(error) {
$scope.test.lxdAuth = "Auth Fail";
})
}
$scope.openTab = function() {
$window.open($scope.testUrl, '_blank');
}
$scope.save = function() {
SettingServices.setMyCfg($scope.myconfig);
}
$scope.testLxd = function() {
SettingServices.testLxd().then(function(data) {
$scope.test.lxd = "Success";
}, function(error) {
$scope.test.lxd = "Fail";
})
}
$scope.testLxdAuth = function() {
SettingServices.testLxdAuth().then(function(data) {
$scope.test.lxdAuth = "Auth Success";
}, function(error) {
$scope.test.lxdAuth = "Auth Fail";
})
}
$scope.openTab = function() {
$window.open($scope.testUrl, '_blank');
}
})
;

186
modules/setting/settings.html
View File

@@ -1,110 +1,112 @@
<div class="row">
<div class="col-md-12">
<h2>Settings for LXD-GUI</h2>
<div class="col-md-12">
<h2>Settings for LXD-GUI</h2>
<span class="label label-danger">{{errMsg}}</span>
<div class="row">
<div class="col-md-2">
LXD Server host:port
</div>
<div class="col-md-5">
<input size="32" type="text" ng-model="myconfig.lxdurl">
</div>
<div class="col-md-2">
<button class="btn btn-primary" type="button" ng-click="save()">Save</button>
<button class="btn btn-primary" type="button" ng-click="openTab()">Open</button>
</div>
</div>
<div class="row">
<div class="col-md-2">
</div>
<div class="col-md-3">
<button class="btn btn-primary" type="button" ng-click="testLxd()">Test LXD</button>
</div>
<div class="col-md-2">
Result: {{test.lxd}}
</div>
</div>
<div class="row">
<div class="col-md-2">
</div>
<div class="col-md-3">
<button class="btn btn-primary" type="button" ng-click="testLxdAuth()">Test LXD Auth</button>
</div>
<div class="col-md-2">
Result: {{test.lxdAuth}}
</div>
</div>
<div class="row">
<div class="col-md-2">
LXD Server host:port
</div>
<div class="col-md-5">
<input size="32" type="text" ng-model="myconfig.lxdurl">
</div>
<div class="col-md-2">
<button class="btn btn-primary" type="button" ng-click="save()">Save</button>
<button class="btn btn-primary" type="button" ng-click="openTab()">Open</button>
</div>
</div>
<div class="row">
<div class="col-md-2">
</div>
<div class="col-md-3">
<button class="btn btn-primary" type="button" ng-click="testLxd()">Test LXD</button>
</div>
<div class="col-md-2">
Result: {{test.lxd}}
</div>
</div>
<div class="row">
<div class="col-md-2">
</div>
<div class="col-md-3">
<button class="btn btn-primary" type="button" ng-click="testLxdAuth()">Test LXD Auth</button>
</div>
<div class="col-md-2">
Result: {{test.lxdAuth}}
</div>
</div>
</div>
</div>
<div class="row">
&nbsp;
&nbsp;
</div>
<div class="row">
<div class="col-md-12">
<h2>Settings for LXD</h2>
<div class="col-md-12">
<h2>Settings for LXD</h2>
<div class="row">
<div class="col-md-2">
Addresses:
</div>
<div class="col-md-2">
{{config.environment.addresses[0]}}
</div>
</div>
<div class="row">
<div class="col-md-2">
Architecture:
</div>
<div class="col-md-2">
{{config.environment.architectures[0]}} / {{config.environment.architectures[1]}}
</div>
</div>
<div class="row">
<div class="col-md-2">
Server Version:
</div>
<div class="col-md-2">
{{config.environment.server_version}}
</div>
</div>
<div class="row">
<div class="col-md-2">
Storage:
</div>
<div class="col-md-2">
{{config.environment.storage}}
</div>
</div>
<div class="row">
<div class="col-md-2">
Addresses:
</div>
<div class="col-md-2">
{{config.environment.addresses[0]}}
</div>
</div>
<div class="row">
<div class="col-md-2">
Architecture:
</div>
<div class="col-md-2">
{{config.environment.architectures[0]}} / {{config.environment.architectures[1]}}
</div>
</div>
<div class="row">
<div class="col-md-2">
Server Version:
</div>
<div class="col-md-2">
{{config.environment.server_version}}
</div>
</div>
<div class="row">
<div class="col-md-2">
Storage:
</div>
<div class="col-md-2">
{{config.environment.storage}}
</div>
</div>
</div>
</div>