IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Display process output as it happens. Fixes #2811

Browse Source
This commit is contained in:
Harshal Dhumal
2017-11-27 13:00:47 +00:00
committed by Dave Page
parent 80c4a3fb1a
commit 7db7da5b0e
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
web/pgadmin/misc/bgprocess/static/js/bgprocess.js
View File

@@ -159,8 +159,12 @@ define('misc.bgprocess', [
while (ie < err.length) {
res.push('<li class="pg-bg-res-err">' + escapeHTML(err[ie++][1]) + '</li>');
}
if (res.length) {
self.logs.append(res.join(''));
setTimeout(function() {
self.logs[0].scrollTop = self.logs[0].scrollHeight;
});
}
if (self.stime) {
@@ -301,9 +305,16 @@ define('misc.bgprocess', [
).append(
$('<span></span>').text(' ' + gettext('seconds'))
);
self.container.find('.pg-bg-status').empty().append(
var $status_bar = $(self.container.find('.pg-bg-status'));
$status_bar.empty().append(
self.curr_status
);
if (self.exit_code === 0) {
$status_bar.addClass('bg-success');
} else if (self.exit_code == 1){
$status_bar.addClass('bg-failed');
}
} else {
self.show_detailed_view.apply(self)
}
@@ -336,7 +347,9 @@ define('misc.bgprocess', [
if (is_new) {
// set logs
$logs.html(self.logs);
setTimeout(function() {
self.logs[0].scrollTop = self.logs[0].scrollHeight;
});
// set bgprocess detailed description
$header.find('.bg-detailed-desc').html(self.detailed_desc);
}