From 0bb4f005e54e701890488ea5093b895b8d1ae4f8 Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Thu, 31 Jan 2019 11:29:18 +0530
Subject: [PATCH] Correct schema should be displayed in Materialized View
 dialog. Fixes #3916

---
 docs/en_US/release_notes_4_2.rst                             | 1 +
 .../servers/databases/schemas/views/static/js/mview.js       | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/en_US/release_notes_4_2.rst b/docs/en_US/release_notes_4_2.rst
index 81f9404bb..455cf21d8 100644
--- a/docs/en_US/release_notes_4_2.rst
+++ b/docs/en_US/release_notes_4_2.rst
@@ -41,6 +41,7 @@ Bug fixes
 | `Bug #3897 <https://redmine.postgresql.org/issues/3897>`_ - Data should be updated properly for FTS Configurations, FTS Dictionaries, FTS Parsers and FTS Templates.
 | `Bug #3903 <https://redmine.postgresql.org/issues/3903>`_ - Fixed Query Tool Initialization Error.
 | `Bug #3908 <https://redmine.postgresql.org/issues/3908>`_ - Fixed keyboard navigation for Select2 and Privilege cell in Backgrid.
+| `Bug #3916 <https://redmine.postgresql.org/issues/3916>`_ - Correct schema should be displayed in Materialized View dialog.
 | `Bug #3927 <https://redmine.postgresql.org/issues/3927>`_ - Fixed debugger issue for procedure inside package for EPAS servers.
 | `Bug #3929 <https://redmine.postgresql.org/issues/3929>`_ - Fix alignment of help messages in properties panels.
 | `Bug #3935 <https://redmine.postgresql.org/issues/3935>`_ - Ensure that grant wizard should list down functions for EPAS server running with no-redwood-compat mode.
\ No newline at end of file
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js
index 4241bbe9f..5cfc25711 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js
@@ -130,9 +130,10 @@ define('pgadmin.node.mview', [
         initialize: function(attrs, args) {
           if (_.size(attrs) === 0) {
             // Set Selected Schema and Current User
-            var userInfo = pgBrowser.serverInfo[args.node_info.server._id].user;
+            var schemaLabel = args.node_info.schema._label || 'public',
+              userInfo = pgBrowser.serverInfo[args.node_info.server._id].user;
             this.set({
-              'schema': 'public', 'owner': userInfo.name,
+              'schema': schemaLabel, 'owner': userInfo.name,
             }, {silent: true});
           }
           pgBrowser.Node.Model.prototype.initialize.apply(this, arguments);