From 3489f94ca728d3c55f813f0f6819e96c8d6a2554 Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Mon, 21 Sep 2020 10:09:41 +0530
Subject: [PATCH] Ensure that multiple extensions can be dropped from the
 properties tab. Fixes #5839.

---
 docs/en_US/release_notes_4_27.rst                             | 3 ++-
 .../servers/databases/extensions/static/js/extension.js       | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/en_US/release_notes_4_27.rst b/docs/en_US/release_notes_4_27.rst
index ba5c55ffb..f718d1ba3 100644
--- a/docs/en_US/release_notes_4_27.rst
+++ b/docs/en_US/release_notes_4_27.rst
@@ -19,4 +19,5 @@ Bug fixes
 
 | `Issue #5417 <https://redmine.postgresql.org/issues/5417>`_ -  Fixed and improve API test cases for the schema diff tool.
 | `Issue #5802 <https://redmine.postgresql.org/issues/5802>`_ -  Remove maximum length on the password field in the server dialog.
-| `Issue #5807 <https://redmine.postgresql.org/issues/5807>`_ -  Fixed an issue where a column is renamed and then removed, then the drop SQL query takes the wrong column name.
\ No newline at end of file
+| `Issue #5807 <https://redmine.postgresql.org/issues/5807>`_ -  Fixed an issue where a column is renamed and then removed, then the drop SQL query takes the wrong column name.
+| `Issue #5839 <https://redmine.postgresql.org/issues/5839>`_ -  Ensure that multiple extensions can be dropped from the properties tab.
\ No newline at end of file
diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js b/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js
index 1d52e5314..fa1093af1 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js
@@ -93,7 +93,7 @@ define('pgadmin.node.extension', [
        * of the model in schema.
        */
       model: pgAdmin.Browser.Node.Model.extend({
-        idAttribute: 'eid',
+        idAttribute: 'oid',
         schema: [
           {
             id: 'name', label: gettext('Name'), first_empty: true,
@@ -181,7 +181,7 @@ define('pgadmin.node.extension', [
             }),
           },
           {
-            id: 'eid', label: gettext('OID'), cell: 'string',
+            id: 'oid', label: gettext('OID'), cell: 'string',
             type: 'text', mode: ['properties'],
           },
           {