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

Modify the web code to allow the Query Tool and Debugger to be opened in new tabs, per settings in Preferences. Fixes #1344

Browse Source 
Note that this does *not* enable the runtime to use multiple windows at this stage. It's really only useful in Server mode.
This commit is contained in:
Akshay Joshi
2017-03-24 14:43:56 +00:00
committed by Dave Page
parent 0eda6033df
commit 569ceb3906
8 changed files with 295 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/pgadmin/tools/sqleditor/__init__.py
View File

@@ -84,6 +84,14 @@ class SqlEditorModule(PgAdminModule):
'Values greater than 1 display the notifier for the number of seconds specified.')
)
self.open_in_new_tab = self.preference.register(
'display', 'new_browser_tab',
gettext("Open in New Browser Tab"), 'boolean', False,
category_label=gettext('Display'),
help_str=gettext('If set to True, the Query Tool '
'will be opened in a new browser tab.')
)
self.explain_verbose = self.preference.register(
'Explain', 'explain_verbose',
gettext("Verbose output?"), 'boolean', False,

95
web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
View File

@@ -228,36 +228,38 @@ define(
self.render_history_grid();
// Listen on the panel closed event and notify user to save modifications.
_.each(window.top.pgAdmin.Browser.docker.findPanels('frm_datagrid'), function(p) {
if(p.isVisible()) {
p.on(wcDocker.EVENT.CLOSING, function() {
// Only if we can edit data then perform this check
var notify = false, msg;
if(self.handler.can_edit) {
var data_store = self.handler.data_store;
if(data_store && (_.size(data_store.added) ||
_.size(data_store.updated))) {
msg = "{{ _('The data has been modified, but not saved. Are you sure you wish to discard the changes?') }}";
if (!self.handler.is_new_browser_tab) {
// Listen on the panel closed event and notify user to save modifications.
_.each(window.top.pgAdmin.Browser.docker.findPanels('frm_datagrid'), function(p) {
if(p.isVisible()) {
p.on(wcDocker.EVENT.CLOSING, function() {
// Only if we can edit data then perform this check
var notify = false, msg;
if(self.handler.can_edit) {
var data_store = self.handler.data_store;
if(data_store && (_.size(data_store.added) ||
_.size(data_store.updated))) {
msg = "{{ _('The data has been modified, but not saved. Are you sure you wish to discard the changes?') }}";
notify = true;
}
} else if(self.handler.is_query_tool && self.handler.is_query_changed) {
msg = "{{ _('The query has been modified, but not saved. Are you sure you wish to discard the changes?') }}";
notify = true;
}
} else if(self.handler.is_query_tool && self.handler.is_query_changed) {
msg = "{{ _('The query has been modified, but not saved. Are you sure you wish to discard the changes?') }}";
notify = true;
}
if(notify) {return self.user_confirmation(p, msg);}
return true;
});
// Set focus on query tool of active panel
p.on(wcDocker.EVENT.GAIN_FOCUS, function() {
if (!$(p.$container).hasClass('wcPanelTabContentHidden')) {
setTimeout(function() {
self.handler.gridView.query_tool_obj.focus();
}, 200);
}
});
}
});
if(notify) {return self.user_confirmation(p, msg);}
return true;
});
// Set focus on query tool of active panel
p.on(wcDocker.EVENT.GAIN_FOCUS, function() {
if (!$(p.$container).hasClass('wcPanelTabContentHidden')) {
setTimeout(function() {
self.handler.gridView.query_tool_obj.focus();
}, 200);
}
});
}
});
}
// set focus on query tool once loaded
setTimeout(function() {
@@ -1517,7 +1519,7 @@ define(
* call the render method of the grid view to render the backgrid
* header and loading icon and start execution of the sql query.
*/
start: function(is_query_tool, editor_title, script_sql) {
start: function(is_query_tool, editor_title, script_sql, is_new_browser_tab) {
var self = this;
self.is_query_tool = is_query_tool;
@@ -1527,6 +1529,7 @@ define(
self.explain_costs = false;
self.explain_buffers = false;
self.explain_timing = false;
self.is_new_browser_tab = is_new_browser_tab;
// We do not allow to call the start multiple times.
if (self.gridView)
@@ -2423,11 +2426,17 @@ define(
// Set panel title.
setTitle: function(title) {
_.each(window.top.pgAdmin.Browser.docker.findPanels('frm_datagrid'), function(p) {
if(p.isVisible()) {
p.title(decodeURIComponent(title));
}
});
var self = this;
if (self.is_new_browser_tab) {
window.document.title = title;
} else {
_.each(window.top.pgAdmin.Browser.docker.findPanels('frm_datagrid'), function(p) {
if(p.isVisible()) {
p.title(decodeURIComponent(title));
}
});
}
},
// load select file dialog
@@ -2571,14 +2580,18 @@ define(
} else {
var title = '';
// Find the title of the visible panel
_.each(window.top.pgAdmin.Browser.docker.findPanels('frm_datagrid'), function(p) {
if(p.isVisible()) {
self.gridView.panel_title = p._title;
}
});
if (self.is_new_browser_tab) {
title = window.document.title + ' *';
} else {
// Find the title of the visible panel
_.each(window.top.pgAdmin.Browser.docker.findPanels('frm_datagrid'), function(p) {
if(p.isVisible()) {
self.gridView.panel_title = p._title;
}
});
title = self.gridView.panel_title + ' *';
title = self.gridView.panel_title + ' *';
}
self.setTitle(title);
}