From 8f45e6fe684cd365537be9685d0b26c4789382b2 Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Thu, 2 Aug 2018 18:15:58 +0530
Subject: [PATCH] View Data->Filtered Rows dialog should be displayed. Fixes
 #3527

---
 docs/en_US/release_notes_3_2.rst                 |  3 ++-
 web/pgadmin/tools/datagrid/static/js/datagrid.js | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/docs/en_US/release_notes_3_2.rst b/docs/en_US/release_notes_3_2.rst
index e584cb2c8..f78fef775 100644
--- a/docs/en_US/release_notes_3_2.rst
+++ b/docs/en_US/release_notes_3_2.rst
@@ -33,4 +33,5 @@ Bug fixes
 | `Bug #3448 <https://redmine.postgresql.org/issues/3448>`_ - Exclude system columns in Import/Export.
 | `Bug #3457 <https://redmine.postgresql.org/issues/3457>`_ - Fix debugging of procedures in EPAS packages.
 | `Bug #3468 <https://redmine.postgresql.org/issues/3468>`_ - Support SSH tunneling with keys that don't have a passphrase.
-| `Bug #3471 <https://redmine.postgresql.org/issues/3471>`_ - Ensure the SSH tunnel port number is honoured.
\ No newline at end of file
+| `Bug #3471 <https://redmine.postgresql.org/issues/3471>`_ - Ensure the SSH tunnel port number is honoured.
+| `Bug #3527 <https://redmine.postgresql.org/issues/3527>`_ - View Data->Filtered Rows dialog should be displayed.
\ No newline at end of file
diff --git a/web/pgadmin/tools/datagrid/static/js/datagrid.js b/web/pgadmin/tools/datagrid/static/js/datagrid.js
index 93e00bc42..2884db46d 100644
--- a/web/pgadmin/tools/datagrid/static/js/datagrid.js
+++ b/web/pgadmin/tools/datagrid/static/js/datagrid.js
@@ -281,7 +281,7 @@ define('pgadmin.datagrid', [
                 alertify.pgDialogBuild.apply(this);
               },
               prepare:function() {
-                var self = this,
+                var that = this,
                   $content = $(this.message),
                   $sql_filter = $content.find('#sql_filter');
 
@@ -296,17 +296,17 @@ define('pgadmin.datagrid', [
                   lineNumbers: true,
                   mode: 'text/x-pgsql',
                   extraKeys: pgBrowser.editor_shortcut_keys,
-                  indentWithTabs: !this.preferences.use_spaces,
-                  indentUnit: this.preferences.tab_size,
-                  tabSize: this.preferences.tab_size,
-                  lineWrapping: this.preferences.wrap_code,
-                  autoCloseBrackets: this.preferences.insert_pair_brackets,
-                  matchBrackets: this.preferences.brace_matching,
+                  indentWithTabs: !self.preferences.use_spaces,
+                  indentUnit: self.preferences.tab_size,
+                  tabSize: self.preferences.tab_size,
+                  lineWrapping: self.preferences.wrap_code,
+                  autoCloseBrackets: self.preferences.insert_pair_brackets,
+                  matchBrackets: self.preferences.brace_matching,
                 });
 
                 setTimeout(function() {
                   // Set focus on editor
-                  self.filter_obj.focus();
+                  that.filter_obj.focus();
                 }, 500);
               },