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 a popup for unsaved changes appears when clicking on the

Browse Source 
open file button for a blank query editor. Fixes #7376
This commit is contained in:
Aditya Toshniwal
2022-05-17 18:56:15 +05:30
committed by Akshay Joshi
parent cb05d2924f
commit fbe7b56054
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_6_10.rst
View File

@@ -19,5 +19,6 @@ Bug fixes
********* *********
| `Issue #7372 <https://redmine.postgresql.org/issues/7372>`_ - Tell Docker to always pull the latest base images when building containers. | `Issue #7372 <https://redmine.postgresql.org/issues/7372>`_ - Tell Docker to always pull the latest base images when building containers.
| `Issue #7376 <https://redmine.postgresql.org/issues/7376>`_ - Fixed an issue where a popup for unsaved changes appears when clicking on the open file button for a blank query editor.
| `Issue #7383 <https://redmine.postgresql.org/issues/7383>`_ - Fixed an issue where Preferences are not saved when the dialog is maximized. | `Issue #7383 <https://redmine.postgresql.org/issues/7383>`_ - Fixed an issue where Preferences are not saved when the dialog is maximized.
| `Issue #7388 <https://redmine.postgresql.org/issues/7388>`_ - Fixed an issue where an error message fills the entire window if the query is long. | `Issue #7388 <https://redmine.postgresql.org/issues/7388>`_ - Fixed an issue where an error message fills the entire window if the query is long.

11
web/pgadmin/tools/sqleditor/static/js/components/sections/MainToolBar.jsx
View File

@@ -214,8 +214,8 @@ export function MainToolBar({containerRef, onFilterClick, onManageMacros}) {
const openFile = useCallback(()=>{ const openFile = useCallback(()=>{
confirmDiscard(()=>{ confirmDiscard(()=>{
eventBus.fireEvent(QUERY_TOOL_EVENTS.TRIGGER_LOAD_FILE); eventBus.fireEvent(QUERY_TOOL_EVENTS.TRIGGER_LOAD_FILE);
}); }, true);
}, []); }, [buttonsDisabled['save']]);
const saveFile = useCallback((saveAs=false)=>{ const saveFile = useCallback((saveAs=false)=>{
eventBus.fireEvent(QUERY_TOOL_EVENTS.TRIGGER_SAVE_FILE, saveAs); eventBus.fireEvent(QUERY_TOOL_EVENTS.TRIGGER_SAVE_FILE, saveAs);
@@ -344,7 +344,12 @@ export function MainToolBar({containerRef, onFilterClick, onManageMacros}) {
let url = url_for('help.static', {'filename': queryToolCtx.params.is_query_tool ? 'query_tool.html' : 'editgrid.html'}); let url = url_for('help.static', {'filename': queryToolCtx.params.is_query_tool ? 'query_tool.html' : 'editgrid.html'});
window.open(url, 'pgadmin_help'); window.open(url, 'pgadmin_help');
}; };
const confirmDiscard=(callback)=>{ const confirmDiscard=(callback, checkSaved=false)=>{
if(checkSaved && buttonsDisabled['save']) {
/* No need to check */
callback();
return;
}
queryToolCtx.modal.confirm( queryToolCtx.modal.confirm(
gettext('Unsaved changes'), gettext('Unsaved changes'),
gettext('Are you sure you wish to discard the current changes?'), gettext('Are you sure you wish to discard the current changes?'),