mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2024-11-22 00:37:36 -06:00
Resolved a typo in the version check condition during schema generation.
Also, resolved an issue related showing the correct server variant in properties dialog, it is a regression introduced by the patch server version check.
This commit is contained in:
parent
5ff09223a2
commit
d753374977
@ -189,8 +189,9 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
|
||||
},{
|
||||
id: 'server_type', label: '{{ _('Server Type') }}', type: 'options',
|
||||
mode: ['properties'], show: 'isConnected',
|
||||
'options': [{% set cnt = 1 %}{% for server_type in server_types %}{% if cnt != 1 %},{% endif %}
|
||||
{label: '{{ server_type.description }}', value: '{{ server_type.type}}'}{% set cnt = cnt + 1 %}{% endfor %}
|
||||
'options': [{% for st in server_types %}
|
||||
{label: '{{ st.description }}', value: '{{ st.server_type }}'},{% endfor %}
|
||||
{label: '{{ _('Unknown') }}', value: ''}
|
||||
]
|
||||
}],
|
||||
validate: function(attrs, options) {
|
||||
|
@ -470,7 +470,7 @@
|
||||
groups[group] = (groups[group] || []);
|
||||
var disabled = ((mode == 'properties') ||
|
||||
(server_info &&
|
||||
(s.server_type && _.indexOf(server_info.type in s.server_type) == -1) ||
|
||||
(s.server_type && !(server_info.type in s.server_type)) ||
|
||||
(s.min_version && s.min_version < server_info.version) ||
|
||||
(s.max_version && s.max_version > server_info.version)
|
||||
));
|
||||
|
Loading…
Reference in New Issue
Block a user