External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-18 13:11:19 -03:30
Code Issues Packages Projects Releases Wiki Activity

Removed old failed hosts logic. Added logic to hide panels where more than two are present

Browse Source
This commit is contained in:
Michael Abashian 2017-04-26 14:53:25 -04:00 committed by Jared Tabor
parent 0b6a5b14a3
commit db8b36a057
9 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/legacy-styles/main-layout.less
View File

@ -93,6 +93,10 @@ body {
margin-top: 20px;
}
.Panel-hidden {
display: none;
}
.btn{
text-transform: uppercase;
}

1
awx/ui/client/src/inventories/groups/groups.list.js
View File

@ -24,7 +24,6 @@ export default {
iconOnly: true,
awToolTip: "{{ group.hosts_status_tip }}",
dataPlacement: "top",
ngClick: "showFailedHosts(group)",
icon: "{{ 'fa icon-job-' + group.hosts_status_class }}",
columnClass: 'status-column List-staticColumn--smallStatus'
},

4
awx/ui/client/src/inventories/groups/list/groups-list.controller.js
View File

@ -183,15 +183,13 @@
$scope.cancelUpdate = function (id) {
GroupsCancelUpdate({ scope: $scope, id: id });
};
$scope.viewUpdateStatus = function (id) {
ViewUpdateStatus({
scope: $scope,
group_id: id
});
};
$scope.showFailedHosts = function() {
// TODO: implement
};
$scope.copyMoveGroup = function(id){
$state.go('inventories.edit.groups.copyMoveGroup', {group_id: id, groups: $stateParams.groups});

5
awx/ui/client/src/inventories/groups/nested-groups/nested-groups-list.controller.js
View File

@ -167,15 +167,14 @@
$scope.cancelUpdate = function (id) {
GroupsCancelUpdate({ scope: $scope, id: id });
};
$scope.viewUpdateStatus = function (id) {
ViewUpdateStatus({
scope: $scope,
group_id: id
});
};
$scope.showFailedHosts = function() {
// TODO: implement
};
// $scope.$parent governed by InventoryManageController, for unified multiSelect options
$scope.$on('multiSelectList.selectionChanged', (event, selection) => {
$scope.$parent.groupsSelected = selection.length > 0 ? true : false;

1
awx/ui/client/src/inventories/groups/nested-groups/nested-groups.list.js
View File

@ -24,7 +24,6 @@ export default {
iconOnly: true,
awToolTip: "{{ nested_group.hosts_status_tip }}",
dataPlacement: "top",
ngClick: "showFailedHosts(nested_group)",
icon: "{{ 'fa icon-job-' + nested_group.hosts_status_class }}",
columnClass: 'status-column List-staticColumn--smallStatus'
},

1
awx/ui/client/src/inventories/inventories.partial.html
View File

@ -1,4 +1,5 @@
<div class="tab-pane" id="inventories-panel">
<aw-limit-panels max-panels="2" panel-container="inventories-panel"></aw-limit-panels>
<div ui-view="copyMove"></div>
<div ui-view="adhocForm"></div>
<div ui-view="hostForm"></div>

30
awx/ui/client/src/shared/limit-panels/limit-panels.directive.js Normal file
View File

@ -0,0 +1,30 @@
export default ['$rootScope', function($rootScope) {
return {
restrict: 'E',
scope: {
maxPanels: '@',
panelContainer: '@'
},
link: function(scope) {
scope.maxPanels = parseInt(scope.maxPanels);
$rootScope.$on('$stateChangeSuccess', function() {
let panels = angular.element('#' + scope.panelContainer).find('.Panel');
if(panels.length > scope.maxPanels) {
// hide the excess panels
$(panels).each(function( index ) {
if(index+1 > scope.maxPanels) {
$(this).addClass('Panel-hidden');
}
});
}
else {
// show all the panels
$(panels).removeClass('Panel-hidden');
}
});
}
};
}];

5
awx/ui/client/src/shared/limit-panels/main.js Normal file
View File

@ -0,0 +1,5 @@
import directive from './limit-panels.directive';
export default
angular.module('LimitPanelsModule', [])
.directive('awLimitPanels', directive);

2
awx/ui/client/src/shared/main.js
View File

@ -30,6 +30,7 @@ import PromptDialog from './prompt-dialog';
import directives from './directives';
import features from './features/main';
import orgAdminLookup from './org-admin-lookup/main';
import limitPanels from './limit-panels/main';
import 'angular-duration-format';
export default
@ -57,6 +58,7 @@ angular.module('shared', [listGenerator.name,
filters.name,
features.name,
orgAdminLookup.name,
limitPanels.name,
require('angular-cookies'),
'angular-duration-format'
])