x/bansho
Code Issues Proposed changes

Merged with basic host_view frontend

Browse Source
This commit is contained in:
Philippe Pepos Petitclerc 2015-03-20 17:40:40 -04:00 committed by Frédéric Vachon
parent f5f549391c
commit 72228d566d
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/components/live/get_objects.js
View File

@ -109,10 +109,10 @@ angular.module('adagios.live')
}); });
}]) }])
.factory('getObjectId', ['$http', function($http) { .factory('getObjectId', ['$http', function ($http) {
return function (objectType, objectName) { return function (objectType, objectName) {
var postData, postString, req; var postString, req;
postString = "with_fields=id&object_type=" + objectType + "&host_name=" + objectName; postString = "with_fields=id&object_type=" + objectType + "&host_name=" + objectName;
@ -132,7 +132,7 @@ angular.module('adagios.live')
}; };
}]) }])
.factory('getHostById', ['$http', function($http) { .factory('getHostById', ['$http', function ($http) {
return function (objectId) { return function (objectId) {
var postString, req; var postString, req;

2
app/host_view/host_view.html
View File

@ -7,7 +7,7 @@
<td>{{key}}</td> <td>{{key}}</td>
<td>{{value}}</td> <td>{{value}}</td>
</tr> </tr>
<tr ng-repeat="key, value in data.config"> <tr ng-repeat="(key, value) in data.config">
<td>{{key}}</td> <td>{{key}}</td>
<td>{{value}}</td> <td>{{value}}</td>
</tr> </tr>

15
app/host_view/host_view.js
View File

@ -16,7 +16,7 @@ angular.module('adagios.view.host_view', ['ngRoute',
.controller('HostViewCtrl', ['$http', '$scope', '$routeParams', 'getObjectId', 'getHostById', .controller('HostViewCtrl', ['$http', '$scope', '$routeParams', 'getObjectId', 'getHostById',
function ($http, $scope, $routeParams, getObjectId, getHostById) { function ($http, $scope, $routeParams, getObjectId, getHostById) {
$scope.data = {} $scope.data = {};
if (!!$routeParams.host) { if (!!$routeParams.host) {
$scope.hostName = $routeParams.host; $scope.hostName = $routeParams.host;
@ -30,23 +30,22 @@ angular.module('adagios.view.host_view', ['ngRoute',
$http.get('/rest/status/json/hosts/?host_name=' + host) $http.get('/rest/status/json/hosts/?host_name=' + host)
.success(function (data) { .success(function (data) {
$scope.data = objectData['live'] = data[0]; $scope.data = objectData.live = data[0];
}); });
objectType = 'host'; objectType = 'host';
getObjectId(objectType, host) getObjectId(objectType, host)
.success(function (data) { .success(function (data) {
objectId = data[0]["id"]; objectId = data[0].id;
$scope.data["id"] = objectId; $scope.data.id = objectId;
getHostById(objectId) getHostById(objectId)
.success(function (data) { .success(function (data) {
$scope.data['config'] = data; $scope.data.config = data;
}) });
}); });
}; };
getData($scope.host); getData($scope.hostName);
}]); }]);