IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2026-08-09 12:38:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

1) Messages tab of query tool should be clear on subsequent execution of table/view using View/Edit Data. Fixes #3608

Browse Source 
2) Clear drop-down menu should be disabled for View/Edit Data. Fixes #3609
This commit is contained in:
Akshay Joshi
2019-01-23 18:25:33 +05:30
parent 08cf2c8310
commit f316e0533e
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/pgadmin/static/js/sqleditor/query_tool_actions.js
+1
View File
@@ -35,6 +35,7 @@ let queryToolActions = {
this._clearMessageTab();
sqlEditorController.execute();
} else {
this._clearMessageTab();
sqlEditorController.execute_data_query();
}
},
web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+1 -3
View File
@@ -104,7 +104,6 @@ define('tools.querytool', [
'click #btn-flash-menu': 'on_flash',
'click #btn-cancel-query': 'on_cancel_query',
'click #btn-download': 'on_download',
'click #btn-edit': 'on_clear',
'click #btn-clear': 'on_clear',
'click #btn-auto-commit': 'on_auto_commit',
'click #btn-auto-rollback': 'on_auto_rollback',
@@ -3433,13 +3432,12 @@ define('tools.querytool', [
// This function is used to enable/disable buttons
disable_tool_buttons: function(disabled) {
$('#btn-clear').prop('disabled', disabled);
$('#btn-clear-dropdown').prop('disabled', disabled);
$('#btn-query-dropdown').prop('disabled', disabled);
$('#btn-explain').prop('disabled', disabled);
$('#btn-explain-analyze').prop('disabled', disabled);
$('#btn-explain-options-dropdown').prop('disabled', disabled);
$('#btn-edit-dropdown').prop('disabled', disabled);
$('#btn-edit').prop('disabled', disabled);
$('#btn-load-file').prop('disabled', disabled);
if (this.is_query_tool) {
// Cancel query tool needs opposite behaviour