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

Prevent the filter dialog CodeMirror from overflowing onto the button bar of the dialog. Fixes #3067

Browse Source
This commit is contained in:
Murtuza Zabuawala 2018-01-31 10:12:04 +00:00 committed by Dave Page
parent d8bd6ea885
commit c6e405ce72
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/pgadmin/tools/datagrid/static/js/datagrid.js
View File

@ -275,11 +275,11 @@ define('pgadmin.datagrid', [
setup: function() { setup: function() {
return { return {
buttons: [{ buttons: [{
text: 'OK', text: gettext('OK'),
className: 'btn btn-primary', className: 'btn btn-primary',
}, },
{ {
text: 'Cancel', text: gettext('Cancel'),
className: 'btn btn-danger', className: 'btn btn-danger',
}, },
], ],
@ -288,6 +288,7 @@ define('pgadmin.datagrid', [
resizable: true, resizable: true,
maximizable: false, maximizable: false,
pinnable: false, pinnable: false,
autoReset: false,
}, },
}; };
}, },

3
web/pgadmin/tools/datagrid/templates/datagrid/filter.html
View File

@ -2,7 +2,8 @@
<textarea id="sql_filter" rows="5" tabindex="0"></textarea> <textarea id="sql_filter" rows="5" tabindex="0"></textarea>
<style> <style>
.filter-textarea .CodeMirror-scroll { .filter-textarea .CodeMirror-scroll {
min-height: 120px; min-height: 120px;
max-height: 120px;
} }
.dataview_filter_dialog { .dataview_filter_dialog {
bottom: 0 !important; bottom: 0 !important;