From c796eee2a79c290edf159bfc63670d82362f07d3 Mon Sep 17 00:00:00 2001 From: Ashesh Vashi Date: Wed, 16 Dec 2015 16:02:12 +0530 Subject: [PATCH] Do not show the properties in property windows, when they're not applicable. i.e. not supported by that version. --- web/pgadmin/static/js/backform.pgadmin.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js index 69e9721f1..533be0280 100644 --- a/web/pgadmin/static/js/backform.pgadmin.js +++ b/web/pgadmin/static/js/backform.pgadmin.js @@ -570,12 +570,14 @@ // Generate the empty group list (if not exists) groups[group] = (groups[group] || []); - var disabled = ((mode == 'properties') || - (server_info && - (s.server_type && !(server_info.type in s.server_type)) || - (s.min_version && server_info.version < s.min_version) || - (s.max_version && server_info.version > s.max_version) - )); + var ver_in_limit = (_.isUndefined(server_info) ? true : + ((_.isUndefined(s.server_type) ? true : + (server_info.type in s.server_type)) && + (_.isUndefined(s.min_version) ? true : + (server_info.version >= s.min_version)) && + (_.isUndefined(s.max_version) ? true : + (server_info.version <= s.max_version)))), + disabled = ((mode == 'properties') || !ver_in_limit); var o = _.extend(_.clone(s), { name: s.id, @@ -594,6 +596,9 @@ control: control, cell: cell, node_info: node_info, + visible: (mode == 'properties'? + (ver_in_limit ? + (s.version || true) : false) : s.version || true) }); delete o.id;