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 tab indent issue on a selection of lines is deleting the content when 'use spaces == true' in the preferences. Fixes #4235

Browse Source
This commit is contained in:
Nikhil Mohite 2020-07-01 13:34:48 +05:30 committed by Akshay Joshi
parent 979f806161
commit c2e875d54b
4 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_4_24.rst
View File

@ -21,6 +21,7 @@ Bug fixes
*********
| `Issue #3851 <https://redmine.postgresql.org/issues/3851>`_ - Add proper indentation to the code while generating functions, procedures, and trigger functions.
| `Issue #4235 <https://redmine.postgresql.org/issues/4235>`_ - Fixed tab indent issue on a selection of lines is deleting the content when 'use spaces == true' in the preferences.
| `Issue #5621 <https://redmine.postgresql.org/issues/5621>`_ - Remove extra brackets from reverse engineering SQL of RLS Policy.
| `Issue #5630 <https://redmine.postgresql.org/issues/5630>`_ - Fixed an issue where installation of pgadmin4 not working on 32-bit Windows.
| `Issue #5631 <https://redmine.postgresql.org/issues/5631>`_ - Fixed 'cant execute empty query' issue when remove the value of 'USING' or 'WITH CHECK' option of RLS Policy.

16
web/pgadmin/static/js/backform.pgadmin.js
View File

@ -2527,6 +2527,22 @@ define([
self.sqlCtrl.setOption('lineWrapping', sqlEditPreferences.wrap_code);
self.sqlCtrl.setOption('autoCloseBrackets', sqlEditPreferences.insert_pair_brackets);
self.sqlCtrl.setOption('matchBrackets', sqlEditPreferences.brace_matching);
// Added extra logic to handel tab indent and use space setting.
self.sqlCtrl.setOption('extraKeys', {
Tab: (cm) => {
if(cm.somethingSelected()){
cm.execCommand('indentMore');
} else {
if (!sqlEditPreferences.use_spaces) {
cm.replaceSelection('\t', 'end', '+input');
}
else {
cm.execCommand('insertSoftTab');
}
}
},
'Shift-Tab': (cm) => cm.execCommand('indentLess'),
});
setTimeout(function() {
if (self.sqlCtrl) self.sqlCtrl.refresh();
}, 500);

16
web/pgadmin/static/js/sqleditor/query_tool_preferences.js
View File

@ -224,6 +224,22 @@ function updateUIPreferences(sqlEditor) {
sqlEditor.query_tool_obj.setOption('lineWrapping', preferences.wrap_code);
sqlEditor.query_tool_obj.setOption('autoCloseBrackets', preferences.insert_pair_brackets);
sqlEditor.query_tool_obj.setOption('matchBrackets', preferences.brace_matching);
// Added extra logic to handel tab indent and use space setting.
sqlEditor.query_tool_obj.setOption('extraKeys', {
Tab: (cm) => {
if(cm.somethingSelected()){
cm.execCommand('indentMore');
} else {
if (!preferences.use_spaces) {
cm.replaceSelection('\t', 'end', '+input');
}
else {
cm.execCommand('insertSoftTab');
}
}
},
'Shift-Tab': (cm) => cm.execCommand('indentLess'),
});
sqlEditor.query_tool_obj.refresh();
/* Render history to reflect Font size change */

16
web/pgadmin/tools/datagrid/static/js/show_data.js
View File

@ -200,6 +200,22 @@ function initFilterDialog(alertify, pgBrowser) {
$(this.filter_obj.getWrapperElement()).css('font-size', sql_font_size);
setTimeout(function() {
// Added extra logic to handel tab indent and use space setting.
that.filter_obj.setOption('extraKeys', {
Tab: (cm) => {
if(cm.somethingSelected()){
cm.execCommand('indentMore');
} else {
if (!that.preferences.use_spaces) {
cm.replaceSelection('\t', 'end', '+input');
}
else {
cm.execCommand('insertSoftTab');
}
}
},
'Shift-Tab': (cm) => cm.execCommand('indentLess'),
});
// Set focus on editor
that.filter_obj.refresh();
that.filter_obj.focus();