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

Fixed an issue where the error message does not have a close button on utility dialogs. Fixes #5670

Browse Source
This commit is contained in:
Yogesh Mahajan 
2020-08-07 17:17:51 +05:30
committed by Akshay Joshi
parent 9ad7476a34
commit 3672013ddc
11 changed files with 88 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/tools/restore/static/js/restore.js
View File

@@ -424,7 +424,7 @@ define('tools.restore', [
let dialog = new restoreDialog.RestoreDialog(
pgBrowser, $, alertify, RestoreObjectModel
);
dialog.draw(action, treeItem, pgBrowser.stdW.calc(), pgBrowser.stdH.calc());
dialog.draw(action, treeItem, pgBrowser.stdW.calc(pgBrowser.stdW.md), pgBrowser.stdH.calc(pgBrowser.stdH.md));
},
};
return pgBrowser.Restore;

7
web/pgadmin/tools/restore/static/js/restore_dialog_wrapper.js
View File

@@ -106,6 +106,9 @@ export class RestoreDialogWrapper extends DialogWrapper {
' <i class="fa fa-exclamation-triangle text-danger" aria-hidden="true"></i> ' +
' </div> ' +
' <div class="alert-text" role="alert"></div> ' +
' <div class="ml-auto close-error-bar"> ' +
' <a aria-label="' + gettext('Close error bar') + '" class="close-error fa fa-times text-danger"></a> ' +
' </div> ' +
' </div> ' +
' </div> ' +
'</div>').appendTo($container);
@@ -240,6 +243,10 @@ export class RestoreDialogWrapper extends DialogWrapper {
ctx.errorModel.set(errorField, errormsg);
statusBar.removeClass('d-none');
statusBar.find('.alert-text').html(errormsg);
self.elements.dialog.querySelector('.close-error').addEventListener('click', ()=>{
statusBar.addClass('d-none');
ctx.errorModel.set(errorField, errormsg);
});
};
if (!_.isUndefined(this.get('file')) && this.get('file') !== '') {