External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 20:00:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

Update style of stdout container

Browse Source
This commit is contained in:
gconsidine 2018-01-09 09:15:54 -05:00 committed by Jake McDermott
parent 3006caffe1
commit b88ad50a75
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/features/jobs/_index.less
View File

@ -90,7 +90,8 @@
}
&-container {
max-height: 80vh;
height: calc(~"100vh - 240px");
overflow-y: scroll;
font-size: 15px;
border: 1px solid @at-gray-dark-2x;
background-color: @at-gray-light-2x;

14
awx/ui/client/features/output/index.controller.js
View File

@ -77,6 +77,9 @@ function JobsIndexController (_job_, JobEventModel, _$sce_, _$timeout_, _$scope_
meta.scroll.height = container[0].scrollHeight;
meta.scroll.buffer = 100;
meta.next = job.get('related.job_events.next');
meta.prev = job.get('related.job_events.previous');
meta.cursor = job.get('related.job_events.results').length - 1;
container.scroll(onScroll);
});
@ -84,8 +87,11 @@ function JobsIndexController (_job_, JobEventModel, _$sce_, _$timeout_, _$scope_
function next () {
job.next('job_events')
.then(data => {
console.log(data);
.then(() => {
meta.next = job.get('related.job_events.next');
meta.prev = job.get('related.job_events.previous');
console.log(job.get('related.job_events.results'));
});
}
@ -338,8 +344,8 @@ function onScroll () {
vm.menu.scroll.display = true;
if (bottom >= meta.scroll.height) {
// fetch more lines
if (bottom >= meta.scroll.height && meta.next) {
next();
}
}, 500);
}

2
awx/ui/client/features/output/index.js
View File

@ -35,7 +35,7 @@ function JobsRun ($stateExtender, strings) {
return new Jobs('get', id)
.then(job => job.extend('job_events', {
params: {
page_size: 1000,
page_size: 13,
order_by: 'start_line'
}
}));