From d1784137a5b9d19746bd04f9733915bf15d2a9cd Mon Sep 17 00:00:00 2001 From: Aditya Toshniwal Date: Mon, 9 Jul 2018 14:08:41 +0100 Subject: [PATCH] Ensure text is visible in the SQL Filter dialogue. Fixes #3478 --- web/pgadmin/static/js/backform.pgadmin.js | 9 ++++++++- web/pgadmin/utils/preferences.py | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js index b979291b3..bb3025946 100644 --- a/web/pgadmin/static/js/backform.pgadmin.js +++ b/web/pgadmin/static/js/backform.pgadmin.js @@ -2075,7 +2075,14 @@ define([ var self = this; /* self.sqlCtrl is null when Definition tab is not active */ if(self.sqlCtrl) { - let sqlEditPreferences = pgAdmin.Browser.get_preferences_for_module('sqleditor'); + + /* This control is used by filter dialog in query editor, so taking preferences from window + * SQL Editor can be in different tab + */ + let browser = window.opener ? + window.opener.pgAdmin.Browser : window.top.pgAdmin.Browser; + + let sqlEditPreferences = browser.get_preferences_for_module('sqleditor'); $(self.sqlCtrl.getWrapperElement()).css( 'font-size',SqlEditorUtils.calcFontSize(sqlEditPreferences.sql_font_size) diff --git a/web/pgadmin/utils/preferences.py b/web/pgadmin/utils/preferences.py index 6e8e00e45..d91da1e4d 100644 --- a/web/pgadmin/utils/preferences.py +++ b/web/pgadmin/utils/preferences.py @@ -617,7 +617,7 @@ class Preferences(object): try: pref.set(value) except Exception as e: - current_app.logger.exeception(e) + current_app.logger.exception(e) return False, str(e) return True, None