External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 21:49:27 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fixed incorrect tool tips on inventory page. Starting AC-977

Browse Source
This commit is contained in:
Chris Houseknecht
2014-04-06 04:29:07 -04:00
parent c7d489026e
commit ece772332f
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/js/controllers/Inventories.js
View File

@@ -129,7 +129,7 @@ function InventoriesList($scope, $rootScope, $location, $log, $routeParams, $com
if (inventory.has_inventory_sources) { if (inventory.has_inventory_sources) {
if (inventory.inventory_sources_with_failures > 0) { if (inventory.inventory_sources_with_failures > 0) {
$scope.inventories[idx].syncStatus = 'error'; $scope.inventories[idx].syncStatus = 'error';
$scope.inventories[idx].syncTip = inventory.groups_with_active_failures + ' groups with sync failures. Click for details'; $scope.inventories[idx].syncTip = inventory.inventory_sources_with_failures + ' groups with sync failures. Click for details';
} }
else { else {
$scope.inventories[idx].syncStatus = 'successful'; $scope.inventories[idx].syncStatus = 'successful';

4
awx/ui/static/js/lists/Streams.js
View File

@@ -108,7 +108,7 @@ angular.module('StreamListDefinition', [])
label: 'Job', label: 'Job',
searchOnly: true, searchOnly: true,
searchObject: 'job', searchObject: 'job',
searchPlaceholder: 'Job id', searchPlaceholder: 'Job name',
searchOnID: true, searchOnID: true,
searchWidget: 2, searchWidget: 2,
searchField: 'object1' searchField: 'object1'
@@ -192,7 +192,7 @@ angular.module('StreamListDefinition', [])
label: 'Job', label: 'Job',
searchOnly: true, searchOnly: true,
searchObject: 'job', searchObject: 'job',
searchPlaceholder: 'Job id', searchPlaceholder: 'Related job name',
searchOnID: true, searchOnID: true,
searchWidget: 3, searchWidget: 3,
searchField: 'object2' searchField: 'object2'

3
awx/ui/static/js/widgets/Stream.js
View File

@@ -154,6 +154,9 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
case 'host': case 'host':
url += 'home/' + obj.base + 's/?id=' + obj.id; url += 'home/' + obj.base + 's/?id=' + obj.id;
break; break;
case 'job':
url += 'jobs/?id=' + obj.id;
break;
case 'inventory': case 'inventory':
url += 'inventories/' + obj.id + '/'; url += 'inventories/' + obj.id + '/';
break; break;