diff --git a/awx/ui/client/src/dashboard/hosts/dashboard-hosts-edit.controller.js b/awx/ui/client/src/dashboard/hosts/dashboard-hosts-edit.controller.js
index 8393088f4a..c70d7d39ad 100644
--- a/awx/ui/client/src/dashboard/hosts/dashboard-hosts-edit.controller.js
+++ b/awx/ui/client/src/dashboard/hosts/dashboard-hosts-edit.controller.js
@@ -27,10 +27,10 @@
description: $scope.description,
enabled: $scope.host.enabled
};
- DashboardHostService.putHost(host).then(function(res){
+ DashboardHostService.putHost(host).then(function(){
$state.go('^', null, {reload: true});
});
-
+
};
var init = function(){
$scope.host = host;
@@ -38,13 +38,13 @@
generator.inject(form, {mode: 'edit', related: false, scope: $scope});
$scope.extraVars = $scope.host.variables === '' ? '---' : $scope.host.variables;
$scope.name = host.name;
- $scope.description = host.description;
- ParseTypeChange({
- scope: $scope,
- field_id: 'host_variables',
- variable: 'extraVars',
+ $scope.description = host.description;
+ ParseTypeChange({
+ scope: $scope,
+ field_id: 'host_variables',
+ variable: 'extraVars',
});
};
init();
- }];
\ No newline at end of file
+ }];
diff --git a/awx/ui/client/src/dashboard/hosts/dashboard-hosts-list.controller.js b/awx/ui/client/src/dashboard/hosts/dashboard-hosts-list.controller.js
index 066ab5f9aa..43970c30b4 100644
--- a/awx/ui/client/src/dashboard/hosts/dashboard-hosts-list.controller.js
+++ b/awx/ui/client/src/dashboard/hosts/dashboard-hosts-list.controller.js
@@ -5,9 +5,17 @@
*************************************************/
export default
- ['$scope', '$state', '$stateParams', 'PageRangeSetup', 'GetBasePath', 'DashboardHostsList',
- 'generateList', 'PaginateInit', 'SetStatus', 'DashboardHostService', 'hosts',
+ ['$scope', '$state', '$stateParams', 'PageRangeSetup', 'GetBasePath', 'DashboardHostsList',
+ 'generateList', 'PaginateInit', 'SetStatus', 'DashboardHostService', 'hosts',
function($scope, $state, $stateParams, PageRangeSetup, GetBasePath, DashboardHostsList, GenerateList, PaginateInit, SetStatus, DashboardHostService, hosts){
+ var setJobStatus = function(){
+ _.forEach($scope.hosts, function(value){
+ SetStatus({
+ scope: $scope,
+ host: value
+ });
+ });
+ };
var generator = GenerateList,
list = DashboardHostsList,
defaultUrl = GetBasePath('hosts');
@@ -23,21 +31,13 @@ export default
});
};
$scope.$on('PostRefresh', function(){
- $scope.hosts = _.map($scope.hosts, function(value, key){
+ $scope.hosts = _.map($scope.hosts, function(value){
value.inventory_name = value.summary_fields.inventory.name;
value.inventory_id = value.summary_fields.inventory.id;
return value;
});
setJobStatus();
});
- var setJobStatus = function(){
- _.forEach($scope.hosts, function(value, key){
- SetStatus({
- scope: $scope,
- host: value
- });
- });
- };
var init = function(){
$scope.list = list;
$scope.host_active_search = false;
@@ -61,4 +61,4 @@ export default
$scope.hostLoading = false;
};
init();
- }];
\ No newline at end of file
+ }];
diff --git a/awx/ui/client/src/dashboard/hosts/dashboard-hosts.form.js b/awx/ui/client/src/dashboard/hosts/dashboard-hosts.form.js
index 654e76a13e..2ae47e1046 100644
--- a/awx/ui/client/src/dashboard/hosts/dashboard-hosts.form.js
+++ b/awx/ui/client/src/dashboard/hosts/dashboard-hosts.form.js
@@ -61,7 +61,7 @@ export default function(){
"YAML:
\n" +
"
---\n" + '
somevar: somevalue
password: magic
View JSON examples at www.json.org
' + - 'View YAML examples at docs.ansible.com
', + 'View YAML examples at docs.ansible.com
', } }, buttons: { @@ -74,4 +74,4 @@ export default function(){ } } }; -}; \ No newline at end of file +} diff --git a/awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js b/awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js index 4731155cbb..9ad52a7899 100644 --- a/awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js +++ b/awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js @@ -89,5 +89,5 @@ export default function(){ actions: { } - } -}; + }; +} diff --git a/awx/ui/client/src/dashboard/hosts/dashboard-hosts.route.js b/awx/ui/client/src/dashboard/hosts/dashboard-hosts.route.js index 84f31ad981..4b8b95b0a6 100644 --- a/awx/ui/client/src/dashboard/hosts/dashboard-hosts.route.js +++ b/awx/ui/client/src/dashboard/hosts/dashboard-hosts.route.js @@ -29,13 +29,13 @@ var dashboardHostsList = { var defaultUrl = GetBasePath('hosts') + '?page_size=10'; Rest.setUrl(defaultUrl); return Rest.get().then(function(res){ - var results = _.map(res.data.results, function(value, key){ + var results = _.map(res.data.results, function(value){ value.inventory_name = value.summary_fields.inventory.name; value.inventory_id = value.summary_fields.inventory.id; return value; }); res.data.results = results; - return res.data + return res.data; }); }] } @@ -61,4 +61,4 @@ var dashboardHostsEdit = { } }; -export {dashboardHostsList, dashboardHostsEdit}; \ No newline at end of file +export {dashboardHostsList, dashboardHostsEdit}; diff --git a/awx/ui/client/src/search/tagSearch.service.js b/awx/ui/client/src/search/tagSearch.service.js index eb004a2e39..fc8111e8ed 100644 --- a/awx/ui/client/src/search/tagSearch.service.js +++ b/awx/ui/client/src/search/tagSearch.service.js @@ -35,7 +35,7 @@ export default ['Rest', '$q', 'GetBasePath', 'Wait', 'ProcessErrors', '$log', fu obj.value = value; obj.label = label; obj.type = type; - obj.basePath = field['basePath'] || null; + obj.basePath = field.basePath || null; // return the built option if (type === 'select') { @@ -81,7 +81,7 @@ export default ['Rest', '$q', 'GetBasePath', 'Wait', 'ProcessErrors', '$log', fu Rest.setUrl(needsRequest[0].basePath ? GetBasePath(needsRequest[0].basePath) : basePath); Rest.options() .success(function (data) { - try { + try { var options = data.actions.GET; needsRequest = needsRequest .map(function (option) {