From 25fcdab9dbdcf7231174c8057dca873603169a49 Mon Sep 17 00:00:00 2001
From: Pradip Parkale <pradip.parkale@enterprisedb.com>
Date: Fri, 30 Oct 2020 15:09:40 +0530
Subject: [PATCH] Fixed an issue where a mismatch in the value of 'Estimated
 row' for functions. Fixes #5914

---
 docs/en_US/release_notes_4_28.rst                    |  1 +
 .../schemas/functions/static/js/function.js          | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/en_US/release_notes_4_28.rst b/docs/en_US/release_notes_4_28.rst
index 9a0234b82..f0337602b 100644
--- a/docs/en_US/release_notes_4_28.rst
+++ b/docs/en_US/release_notes_4_28.rst
@@ -28,6 +28,7 @@ Bug fixes
 | `Issue #5858 <https://redmine.postgresql.org/issues/5858>`_ -  Ensure that search object functionality works with case insensitive string.
 | `Issue #5895 <https://redmine.postgresql.org/issues/5895>`_ -  Fixed an issue where the suffix for Toast table size is not visible in the Statistics tab.
 | `Issue #5911 <https://redmine.postgresql.org/issues/5911>`_ -  Ensure that macros should be run on the older version of Safari and Chrome.
+| `Issue #5914 <https://redmine.postgresql.org/issues/5914>`_ -  Fixed an issue where a mismatch in the value of 'Estimated row' for functions.
 | `Issue #5919 <https://redmine.postgresql.org/issues/5919>`_ -  Added security related enhancements.
 | `Issue #5923 <https://redmine.postgresql.org/issues/5923>`_ -  Fixed an issue where non-closeable tabs are getting closed.
 | `Issue #5953 <https://redmine.postgresql.org/issues/5953>`_ -  Fixed an issue where connection to the server is on wait state if a different user is provided.
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
index fdfc2afff..3790fd6eb 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
@@ -433,7 +433,11 @@ define('pgadmin.node.function', [
           if (this.name == 'sysproc') { return false; }
           return true;
         },
-        isDisabled: function() {
+        isDisabled: function(m) {
+          //Disable the returns a set and window in edit mode.
+          if((this.name == 'proretset' || this.name == 'proiswindow') && !m.isNew()){
+            return true;
+          }
           if(this.node_info && 'catalog' in this.node_info) {
             return true;
           }
@@ -456,11 +460,11 @@ define('pgadmin.node.function', [
             return !m.isNew();
           case 'prorows':
             if(m.get('proretset') == true) {
-              setTimeout(function() {
-                m.set('prorows', 0);
-              }, 10);
               return false;
             }
+            setTimeout(function() {
+              m.set('prorows', 0);
+            }, 10);
             return true;
           default:
             return false;