[pgAdmin4][Patch]: Fix regression issues

[Murtuza Zabuawala]

Hi,

PFA patches,

1)
To fix the issue where base types are displaying in create/edit dialog,
also corrected the condition to show hidden system types.
RM#2692

This issue is regression of commit: Link
<https://git.postgresql.org/gitweb/?p=pgadmin4.git;a=commit;h=eae6f0427c7c2e3350dd67aacc62a1053b2dd1a3>

2)
To fix the issue in User mapping module where users were not listed.
RM#2693


--
Regards,
Murtuza Zabuawala
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

[image: https://community.postgresrocks.net/]
<https://community.postgresrocks.net/>

diff --git 
a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py
 
b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py
index d00b187..f17bf4c 100644
--- 
a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py
+++ 
b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py
@@ -493,7 +493,8 @@ AND relname = typname AND relkind != 'c') AND
 relnamespace=typnamespace AND relname = substring(typname FROM 2)::name
 AND relkind != 'c'))"""
 
-        if self.blueprint.show_system_objects:
+        # To show hidden objects
+        if not self.blueprint.show_system_objects:
             condition += " AND nsp.nspname != 'information_schema'"
 
         # Get Types
diff --git 
a/web/pgadmin/browser/server_groups/servers/databases/schemas/utils.py 
b/web/pgadmin/browser/server_groups/servers/databases/schemas/utils.py
index 69e94b1..3993ddc 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/utils.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/utils.py
@@ -93,6 +93,16 @@ class DataTypeReader:
         """
         res = []
         try:
+            # Check if template path is already set or not
+            # if not then we will set the template path here
+            if not hasattr(self, 'data_type_template_path'):
+                self.data_type_template_path = 'datatype/sql/' + (
+                    '#{0}#{1}#'.format(
+                        self.manager.server_type,
+                        self.manager.version
+                    ) if self.manager.server_type == 'gpdb' else
+                    '#{0}#'.format(self.manager.version)
+                )
 
             SQL = render_template(
                 "/".join([self.data_type_template_path,'get_types.sql']),

diff --git 
a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/js/user_mapping.js
 
b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/js/user_mapping.js
index bbfeb84..91dc21a 100644
--- 
a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/js/user_mapping.js
+++ 
b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/js/user_mapping.js
@@ -119,8 +119,8 @@ define('pgadmin.node.user_mapping', [
           mode: ['edit', 'create', 'properties'], select2: { allowClear: false 
},
           disabled: function(m) { return !m.isNew(); },
           transform: function(data) {
-            var self = this;
-            node = self.field.get('schema_node');
+            var self = this,
+              node = self.field.get('schema_node');
             var res =
             Backform.NodeListByNameControl.prototype.defaults.transform.apply(
               this, arguments