External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-16 18:50:04 -03:30
Code Issues Packages Projects Releases Wiki Activity

Job events now expands all parent nodes correctly or consistently.

Browse Source
This commit is contained in:
chouseknecht
2013-07-02 12:00:20 -04:00
parent 6e0b9a2acb
commit 507d1d06f5
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/static/js/controllers/JobEvents.js
View File

@@ -58,11 +58,10 @@ function JobEventsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
if (scope.removeSetExpanded) { if (scope.removeSetExpanded) {
scope.removeSetExpanded(); scope.removeSetExpanded();
} }
scope.removeSetExpanded = scope.$on('setExpanded', function(event, latest_node) { scope.removeSetExpanded = scope.$on('setExpanded', function(event) {
// After ToggleChildren completes, look for the next parent that needs to be expanded // After ToggleChildren completes, look for the next parent that needs to be expanded
var found = false; var found = false;
var start = (latest_node) ? latest_node : 0; for (var i=0; i < set.length && found == false && scope.expand; i++) {
for (var i=start; i < set.length && found == false && scope.expand; i++) {
if (set[i]['related']['children'] && (set[i]['ngicon'] == undefined || set[i]['ngicon'] == 'icon-expand-alt')) { if (set[i]['related']['children'] && (set[i]['ngicon'] == undefined || set[i]['ngicon'] == 'icon-expand-alt')) {
found = true; found = true;
ToggleChildren({ ToggleChildren({

2
awx/ui/static/js/helpers/Children.js
View File

@@ -81,7 +81,7 @@ angular.module('ChildrenHelper', ['RestServices', 'Utilities'])
} }
clicked++; clicked++;
} }
scope.$emit('setExpanded', clicked - 1); scope.$emit('setExpanded');
}) })
.error( function(data, status, headers, config) { .error( function(data, status, headers, config) {
ProcessErrors(scope, data, status, null, ProcessErrors(scope, data, status, null,