mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(mod/dashboard): fix after api changes

Browse Source 
use node instead of kvs and value
This commit is contained in:
Brandon Philips
2013-12-13 12:36:29 -08:00
parent fe80a868a0
commit e24d2fdb6c
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mod/dashboard/app/scripts/common/services/etcd.js
View File

@ -88,7 +88,9 @@ angular.module('etcd', [])
return newStat('leader').get().then(function(response) { return newStat('leader').get().then(function(response) {
return newKey('/_etcd/machines/' + response.data.leader).get().then(function(response) { return newKey('/_etcd/machines/' + response.data.leader).get().then(function(response) {
// TODO: do something better here p.s. I hate javascript // TODO: do something better here p.s. I hate javascript
var data = JSON.parse('{"' + decodeURI(response.data.value.replace(/&/g, "\",\"").replace(/=/g,"\":\"")) + '"}'); var data = decodeURIComponent(response.data.node.value);
data = data.replace(/&/g, "\",\"").replace(/=/g,"\":\"");
data = JSON.parse('{"' + data + '"}');
return data.etcd; return data.etcd;
}); });
}); });

5
mod/dashboard/app/scripts/controllers/browser.js
View File

@ -56,17 +56,18 @@ angular.module('etcdBrowser', ['ngRoute', 'etcd', 'timeRelative'])
return; return;
} }
$scope.key.get().success(function (data, status, headers, config) { $scope.key.get().success(function (data, status, headers, config) {
console.log(data)
//hide any errors //hide any errors
$('#etcd-browse-error').hide(); $('#etcd-browse-error').hide();
// Looking at a directory if we got an array // Looking at a directory if we got an array
if (data.dir === true) { if (data.dir === true) {
$scope.list = data.kvs; $scope.list = data.node.nodes;
$scope.preview = 'etcd-preview-hide'; $scope.preview = 'etcd-preview-hide';
} else { } else {
$scope.singleValue = data.value; $scope.singleValue = data.value;
$scope.preview = 'etcd-preview-reveal'; $scope.preview = 'etcd-preview-reveal';
$scope.key.getParent().get().success(function(data) { $scope.key.getParent().get().success(function(data) {
$scope.list = data.kvs; $scope.list = data.node.nodes;
}); });
} }
$scope.previewMessage = 'No key selected.'; $scope.previewMessage = 'No key selected.';