IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-29 03:53:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

Resolved a typo in the version check condition during schema generation.

Browse Source 
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:
Ashesh Vashi 2015-11-20 10:45:30 +05:30
parent 5ff09223a2
commit d753374977
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/pgadmin/browser/server_groups/servers/templates/servers/servers.js
View File

@ -189,8 +189,9 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
},{ },{
id: 'server_type', label: '{{ _('Server Type') }}', type: 'options', id: 'server_type', label: '{{ _('Server Type') }}', type: 'options',
mode: ['properties'], show: 'isConnected', mode: ['properties'], show: 'isConnected',
'options': [{% set cnt = 1 %}{% for server_type in server_types %}{% if cnt != 1 %},{% endif %} 'options': [{% for st in server_types %}
{label: '{{ server_type.description }}', value: '{{ server_type.type}}'}{% set cnt = cnt + 1 %}{% endfor %} {label: '{{ st.description }}', value: '{{ st.server_type }}'},{% endfor %}
{label: '{{ _('Unknown') }}', value: ''}
] ]
}], }],
validate: function(attrs, options) { validate: function(attrs, options) {

2
web/pgadmin/static/js/backform.pgadmin.js
View File

@ -470,7 +470,7 @@
groups[group] = (groups[group] || []); groups[group] = (groups[group] || []);
var disabled = ((mode == 'properties') || var disabled = ((mode == 'properties') ||
(server_info && (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.min_version && s.min_version < server_info.version) ||
(s.max_version && s.max_version > server_info.version) (s.max_version && s.max_version > server_info.version)
)); ));