From c6e405ce72a1bc1d203c238b7fb2a09e4d7e4faf Mon Sep 17 00:00:00 2001 From: Murtuza Zabuawala Date: Wed, 31 Jan 2018 10:12:04 +0000 Subject: [PATCH] Prevent the filter dialog CodeMirror from overflowing onto the button bar of the dialog. Fixes #3067 --- web/pgadmin/tools/datagrid/static/js/datagrid.js | 5 +++-- web/pgadmin/tools/datagrid/templates/datagrid/filter.html | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/pgadmin/tools/datagrid/static/js/datagrid.js b/web/pgadmin/tools/datagrid/static/js/datagrid.js index e7329c361..628fe0da0 100644 --- a/web/pgadmin/tools/datagrid/static/js/datagrid.js +++ b/web/pgadmin/tools/datagrid/static/js/datagrid.js @@ -275,11 +275,11 @@ define('pgadmin.datagrid', [ setup: function() { return { buttons: [{ - text: 'OK', + text: gettext('OK'), className: 'btn btn-primary', }, { - text: 'Cancel', + text: gettext('Cancel'), className: 'btn btn-danger', }, ], @@ -288,6 +288,7 @@ define('pgadmin.datagrid', [ resizable: true, maximizable: false, pinnable: false, + autoReset: false, }, }; }, diff --git a/web/pgadmin/tools/datagrid/templates/datagrid/filter.html b/web/pgadmin/tools/datagrid/templates/datagrid/filter.html index 8cc9a9fe9..f366ed601 100644 --- a/web/pgadmin/tools/datagrid/templates/datagrid/filter.html +++ b/web/pgadmin/tools/datagrid/templates/datagrid/filter.html @@ -2,7 +2,8 @@