From d774a0ff6766f410fa8c1aaad460700d53cf03e7 Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Tue, 11 Jun 2019 17:48:01 +0530
Subject: [PATCH] Fix issue where property dialog of column should open
 properly for EPAS v12. Fixes #4343

---
 docs/en_US/release_notes_4_9.rst                               | 3 ++-
 .../databases/schemas/tables/columns/static/js/column.js       | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/en_US/release_notes_4_9.rst b/docs/en_US/release_notes_4_9.rst
index 93e94eac3..befdfaad1 100644
--- a/docs/en_US/release_notes_4_9.rst
+++ b/docs/en_US/release_notes_4_9.rst
@@ -23,4 +23,5 @@ Bug fixes
 | `Bug #4310 <https://redmine.postgresql.org/issues/4310>`_ - Ensure that the Return key can be used to submit the Master Password dialogue.
 | `Bug #4317 <https://redmine.postgresql.org/issues/4317>`_ - Ensure that browser auto-fill doesn't cause Help pages to be opened unexpectedly.
 | `Bug #4320 <https://redmine.postgresql.org/issues/4320>`_ - Fix issue where SSH tunnel connection using password is failing, it's regression of Master Password.
-| `Bug #4329 <https://redmine.postgresql.org/issues/4329>`_ - Fix an initialisation error when two functions with parameters are debugged in parallel.
\ No newline at end of file
+| `Bug #4329 <https://redmine.postgresql.org/issues/4329>`_ - Fix an initialisation error when two functions with parameters are debugged in parallel.
+| `Bug #4343 <https://redmine.postgresql.org/issues/4343>`_ - Fix issue where property dialog of column should open properly for EPAS v12.
\ No newline at end of file
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js
index 74b37042a..3ece03f7c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js
@@ -230,6 +230,7 @@ define('pgadmin.node.column', [
             if (
               m.top && ((
                 !_.isUndefined(m.top.get('oid')) &&
+                  !_.isUndefined(m.top.get('primary_key')) &&
                   m.top.get('primary_key').length > 0 &&
                   !_.isUndefined(m.top.get('primary_key').first().get('oid'))
               ) || (
@@ -255,6 +256,7 @@ define('pgadmin.node.column', [
             }
             // If primary key already exist then disable.
             if (m.top && !_.isUndefined(m.top.get('oid')) &&
+                      !_.isUndefined(m.top.get('primary_key')) &&
                       m.top.get('primary_key').length > 0 &&
                       !_.isUndefined(m.top.get('primary_key').first().get('oid'))) {