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

Disabled the Stop process button after clicking it and added a message 'Terminating the process...' to notify the user. Fixes #3787

Browse Source
This commit is contained in:
Nagesh Dhope 2020-06-02 11:23:52 +05:30 committed by Akshay Joshi
parent a0c19252df
commit c932213abd
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_4_23.rst
View File

@ -19,6 +19,7 @@ Housekeeping
Bug fixes Bug fixes
********* *********
| `Issue #3787 <https://redmine.postgresql.org/issues/3787>`_ - Disabled the Stop process button after clicking it and added a message 'Terminating the process...' to notify the user.
| `Issue #5416 <https://redmine.postgresql.org/issues/5416>`_ - Ensure that the query tool panel gets closed when clicking on the 'Don't Save' button. | `Issue #5416 <https://redmine.postgresql.org/issues/5416>`_ - Ensure that the query tool panel gets closed when clicking on the 'Don't Save' button.
| `Issue #5465 <https://redmine.postgresql.org/issues/5465>`_ - Fixed an issue where the Edge browser version is showing wrong and warning message gets displayed. | `Issue #5465 <https://redmine.postgresql.org/issues/5465>`_ - Fixed an issue where the Edge browser version is showing wrong and warning message gets displayed.
| `Issue #5521 <https://redmine.postgresql.org/issues/5521>`_ - Fixed an issue when dumping servers from a desktop pgAdmin app by providing an option '--sqlite-path'. | `Issue #5521 <https://redmine.postgresql.org/issues/5521>`_ - Fixed an issue when dumping servers from a desktop pgAdmin app by providing an option '--sqlite-path'.

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

@ -234,6 +234,8 @@ define('misc.bgprocess', [
{status_text:gettext('Failed (exit code: %s).', String(self.exit_code))} {status_text:gettext('Failed (exit code: %s).', String(self.exit_code))}
); );
} }
} else if (_.isNull(self.exit_code) && self.state === 3) {
self.curr_status = self.other_status_tpl({status_text:gettext('Terminating the process...')});
} }
if (self.state == 0 && self.stime) { if (self.state == 0 && self.stime) {
@ -312,7 +314,7 @@ define('misc.bgprocess', [
<div class="pg-bg-etime my-auto mr-2"></div> <div class="pg-bg-etime my-auto mr-2"></div>
<div class="ml-auto"> <div class="ml-auto">
<button class="btn btn-secondary pg-bg-more-details"><span class="fa fa-info-circle" role="img"></span>&nbsp;` + gettext('More details...') + `</button> <button class="btn btn-secondary pg-bg-more-details"><span class="fa fa-info-circle" role="img"></span>&nbsp;` + gettext('More details...') + `</button>
<button class="btn btn-danger bg-process-stop"><span class="fa fa-times-circle" role="img"></span>&nbsp;` + gettext('Stop Process') + `</button> <button class="btn btn-danger bg-process-stop" disabled><span class="fa fa-times-circle" role="img"></span>&nbsp;` + gettext('Stop Process') + `</button>
</div> </div>
</div> </div>
<div class="pg-bg-status py-1"> <div class="pg-bg-status py-1">
@ -372,9 +374,9 @@ define('misc.bgprocess', [
var $status_bar = $(self.container.find('.pg-bg-status')); var $status_bar = $(self.container.find('.pg-bg-status'));
$status_bar.html(self.curr_status); $status_bar.html(self.curr_status);
// Enable/Disable stop process button
var $btn_stop_process = $(self.container.find('.bg-process-stop')); var $btn_stop_process = $(self.container.find('.bg-process-stop'));
if (isNaN(parseInt(self.exit_code))) { // Enable Stop Process button only when process is running
if (parseInt(self.state) === 1) {
$btn_stop_process.attr('disabled', false); $btn_stop_process.attr('disabled', false);
} else { } else {
$btn_stop_process.attr('disabled', true); $btn_stop_process.attr('disabled', true);
@ -403,8 +405,8 @@ define('misc.bgprocess', [
$footer = container.find('.bg-process-footer'), $footer = container.find('.bg-process-footer'),
$btn_stop_process = container.find('.bg-process-stop'); $btn_stop_process = container.find('.bg-process-stop');
// Enable/Disable stop process button // Enable Stop Process button only when process is running
if (isNaN(parseInt(self.exit_code))) { if (parseInt(self.state) === 1) {
$btn_stop_process.attr('disabled', false); $btn_stop_process.attr('disabled', false);
} else { } else {
$btn_stop_process.attr('disabled', true); $btn_stop_process.attr('disabled', true);
@ -621,7 +623,7 @@ define('misc.bgprocess', [
'</span>'+ '</span>'+
'</div>' + '</div>' +
'<div class="ml-auto">' + '<div class="ml-auto">' +
'<button type="button" class="btn btn-danger bg-process-stop"><span class="fa fa-times-circle" role="img"></span>&nbsp;' + gettext('Stop Process') + '</button>' + '<button type="button" class="btn btn-danger bg-process-stop" disabled><span class="fa fa-times-circle" role="img"></span>&nbsp;' + gettext('Stop Process') + '</button>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>' + '</div>' +