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

Job detail page

Browse Source 
Disabled clicking on play or task while live events are happening.
This commit is contained in:
Chris Houseknecht
2014-07-02 18:47:08 -04:00
parent 1c57d49981
commit 803f0b6d12
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
awx/ui/static/js/controllers/JobDetail.js
View File

@@ -593,19 +593,23 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
}, 500)); }, 500));
scope.selectPlay = function(id) { scope.selectPlay = function(id) {
scope.auto_scroll_plays = false; if (!scope.liveEventProcessing) {
SelectPlay({ scope.auto_scroll_plays = false;
scope: scope, SelectPlay({
id: id scope: scope,
}); id: id
});
}
}; };
scope.selectTask = function(id) { scope.selectTask = function(id) {
scope.auto_scroll_tasks = false; if (!scope.liveEventProcessing) {
SelectTask({ scope.auto_scroll_tasks = false;
scope: scope, SelectTask({
id: id scope: scope,
}); id: id
});
}
}; };
scope.toggleSummary = function(hide) { scope.toggleSummary = function(hide) {

6
awx/ui/static/js/helpers/JobDetail.js
View File

@@ -968,7 +968,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
} }
scope.plays = result; scope.plays = result;
if (scope.liveEventProcessing) { if (scope.liveEventProcessing) {
scope.$emit('FixPlaysScroll'); $('#plays-table-detail').scrollTop($('#plays-table-detail').prop("scrollHeight"));
} }
}; };
}]) }])
@@ -1005,7 +1005,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
scope.tasks = result; scope.tasks = result;
if (scope.liveEventProcessing) { if (scope.liveEventProcessing) {
scope.$emit('FixTasksScroll'); $('#tasks-table-detail').scrollTop($('#tasks-table-detail').prop("scrollHeight"));
} }
}; };
}]) }])
@@ -1043,7 +1043,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
} }
scope.hostResults = result; scope.hostResults = result;
if (scope.liveEventProcessing) { if (scope.liveEventProcessing) {
scope.$emit('FixHostResultsScroll'); $('#hosts-table-detail').scrollTop($('#hosts-table-detail').prop("scrollHeight"));
} }
}; };
}]) }])

8
awx/ui/static/partials/job_detail.html
View File

@@ -81,11 +81,10 @@
<div class="col-lg-1 col-md-1 col-sm-2 hidden-xs">Started</div> <div class="col-lg-1 col-md-1 col-sm-2 hidden-xs">Started</div>
<div class="col-lg-1 col-md-1 hidden-sm hidden-xs">Elapsed</div> <div class="col-lg-1 col-md-1 hidden-sm hidden-xs">Elapsed</div>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12">Name</div> <div class="col-lg-10 col-md-10 col-sm-10 col-xs-12">Name</div>
<!-- <div class="col-lg-2 col-md-2 hidden-sm hidden-xs text-right">Reporting Hosts</div>
<div class="col-lg-2 col-md-2 hidden-sm hidden-xs text-right">Unreachable Hosts</div> -->
</div> </div>
</div> </div>
<div id="plays-table-detail" aw-custom-scroll class="table-detail"> <div id="plays-table-detail" class="table-detail" lr-infinite-scroll="playsScrollDown"
scroll-threshold="10" time-threshold="500">
<div class="row cursor-pointer" ng-repeat="play in playList = (plays | FilterById : search_all_plays | FilterFailedEvents : liveEventProcessing : searchAllStatus) track by $index" <div class="row cursor-pointer" ng-repeat="play in playList = (plays | FilterById : search_all_plays | FilterFailedEvents : liveEventProcessing : searchAllStatus) track by $index"
ng-class="play.playActiveClass" ng-click="selectPlay(play.id)"> ng-class="play.playActiveClass" ng-click="selectPlay(play.id)">
<div class="col-lg-1 col-md-1 col-sm-2 hidden-xs">{{ play.created | date: 'HH:mm:ss' }}</div> <div class="col-lg-1 col-md-1 col-sm-2 hidden-xs">{{ play.created | date: 'HH:mm:ss' }}</div>
@@ -96,8 +95,6 @@
aw-tool-tip="{{ play.status_tip }}" data-tip-watch="play.status_tip" data-placement="top"> aw-tool-tip="{{ play.status_tip }}" data-tip-watch="play.status_tip" data-placement="top">
<i class="fa icon-job-{{ play.status }}"></i> {{ play.name }}</span> <i class="fa icon-job-{{ play.status }}"></i> {{ play.name }}</span>
</div> </div>
<!--<div class="col-lg-2 col-md-2 hidden-sm hidden-xs text-right">{{ play.hostCount }}</div>
<div class="col-lg-2 col-md-2 hidden-sm hidden-xs text-right">{{ play.unreachableCount }}</div>-->
</div> </div>
<div class="row" ng-show="playList.length == 0"> <div class="row" ng-show="playList.length == 0">
<div class="col-lg-12"> <div class="col-lg-12">
@@ -105,6 +102,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="scroll-spinner" id="playsMoreRows"><i class="fa fa-cog fa-spin"></i></div>
</div><!-- section --> </div><!-- section -->
<div id="task-section" class="section" tasks=> <div id="task-section" class="section" tasks=>