Fixed the regression where initial changes make the Save button enabled when the table dialog is opened. Fixes #4504

This commit is contained in:
Pradip Parkale 2020-04-27 18:48:44 +05:30 committed by Akshay Joshi
parent b80784f5a1
commit 18748846ef

View File

@ -860,28 +860,28 @@ define('pgadmin.node.table', [
group: gettext('advanced'), group: gettext('advanced'),
schema:[{ schema:[{
id: 'like_relation', label: gettext('Relation'), id: 'like_relation', label: gettext('Relation'),
type: 'text', mode: ['create', 'edit'], deps: ['typname', 'like_relation'], type: 'text', mode: ['create'], deps: ['typname', 'like_relation'],
control: 'node-ajax-options', url: 'get_relations', control: 'node-ajax-options', url: 'get_relations',
disabled: 'isLikeDisable', group: gettext('Like'), disabled: 'isLikeDisable', group: gettext('Like'),
},{ },{
id: 'like_default_value', label: gettext('With default values?'), id: 'like_default_value', label: gettext('With default values?'),
type: 'switch', mode: ['create', 'edit'], deps: ['like_relation'], type: 'switch', mode: ['create'], deps: ['like_relation'],
disabled: 'isRelationDisable', group: gettext('Like'), disabled: 'isRelationDisable', group: gettext('Like'),
},{ },{
id: 'like_constraints', label: gettext('With constraints?'), id: 'like_constraints', label: gettext('With constraints?'),
type: 'switch', mode: ['create', 'edit'], deps: ['like_relation'], type: 'switch', mode: ['create'], deps: ['like_relation'],
disabled: 'isRelationDisable', group: gettext('Like'), disabled: 'isRelationDisable', group: gettext('Like'),
},{ },{
id: 'like_indexes', label: gettext('With indexes?'), id: 'like_indexes', label: gettext('With indexes?'),
type: 'switch', mode: ['create', 'edit'], deps: ['like_relation'], type: 'switch', mode: ['create'], deps: ['like_relation'],
disabled: 'isRelationDisable', group: gettext('Like'), disabled: 'isRelationDisable', group: gettext('Like'),
},{ },{
id: 'like_storage', label: gettext('With storage?'), id: 'like_storage', label: gettext('With storage?'),
type: 'switch', mode: ['create', 'edit'], deps: ['like_relation'], type: 'switch', mode: ['create'], deps: ['like_relation'],
disabled: 'isRelationDisable', group: gettext('Like'), disabled: 'isRelationDisable', group: gettext('Like'),
},{ },{
id: 'like_comments', label: gettext('With comments?'), id: 'like_comments', label: gettext('With comments?'),
type: 'switch', mode: ['create', 'edit'], deps: ['like_relation'], type: 'switch', mode: ['create'], deps: ['like_relation'],
disabled: 'isRelationDisable', group: gettext('Like'), disabled: 'isRelationDisable', group: gettext('Like'),
}], }],
},{ },{
@ -1253,6 +1253,7 @@ define('pgadmin.node.table', [
if ( _.isUndefined(m.get('like_relation')) || if ( _.isUndefined(m.get('like_relation')) ||
_.isNull(m.get('like_relation')) || _.isNull(m.get('like_relation')) ||
String(m.get('like_relation')).replace(/^\s+|\s+$/g, '') == ''){ String(m.get('like_relation')).replace(/^\s+|\s+$/g, '') == ''){
if (m.isNew()){
setTimeout(function() { setTimeout(function() {
m.set('like_default_value', false); m.set('like_default_value', false);
m.set('like_constraints', false); m.set('like_constraints', false);
@ -1260,7 +1261,7 @@ define('pgadmin.node.table', [
m.set('like_storage', false); m.set('like_storage', false);
m.set('like_comments', false); m.set('like_comments', false);
}, 10); }, 10);
}
return true; return true;
} }
return false; return false;