IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

1) Source/Target database and schema should be selected by default when the user selects any server in the schema diff tool.

Browse Source 
2) Added line break for the generated script if select multiple objects.
3) Remove reactivated RM from the release notes.
This commit is contained in:
Akshay Joshi
2020-02-05 14:36:05 +05:30
parent 520b03cb0a
commit 26cdda090e
3 changed files with 53 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/pgadmin/tools/schema_diff/__init__.py
View File

@@ -555,7 +555,7 @@ def generate_script(trans_id):
comp_status=comp_status,
generate_script=True)
diff_ddl += sql['diff_ddl']
diff_ddl += sql['diff_ddl'] + '\n\n'
return ajax_response(
status=200,
@@ -585,10 +585,6 @@ def ddl_compare(trans_id, source_sid, source_did, source_scid,
if error_msg == gettext('Transaction ID not found in the session.'):
return make_json_response(success=0, errormsg=error_msg, status=404)
source_ddl = ''
target_ddl = ''
diff_ddl = ''
view = SchemaDiffRegistry.get_node_view(node_type)
if view and hasattr(view, 'ddl_compare'):
sql = view.ddl_compare(source_sid=source_sid, source_did=source_did,

56
web/pgadmin/tools/schema_diff/static/js/schema_diff_ui.js
View File

@@ -600,8 +600,20 @@ export default class SchemaDiffUI {
placeholder: gettext('Select database...'),
},
disabled: function(m) {
if (!_.isUndefined(m.get('source_sid')) && !_.isNull(m.get('source_sid')))
let self = this;
if (!_.isUndefined(m.get('source_sid')) && !_.isNull(m.get('source_sid'))
&& m.get('source_sid') !== '') {
setTimeout(function() {
if (self.options.length > 0) {
m.set('source_did', self.options[0].value);
}
}, 10);
return false;
}
setTimeout(function() {
m.set('source_did', undefined);
}, 10);
return true;
},
connect: function() {
@@ -622,8 +634,20 @@ export default class SchemaDiffUI {
placeholder: gettext('Select schema...'),
},
disabled: function(m) {
if (!_.isUndefined(m.get('source_did')) && !_.isNull(m.get('source_did')))
let self = this;
if (!_.isUndefined(m.get('source_did')) && !_.isNull(m.get('source_did'))
&& m.get('source_did') !== '') {
setTimeout(function() {
if (self.options.length > 0) {
m.set('source_scid', self.options[0].value);
}
}, 10);
return false;
}
setTimeout(function() {
m.set('source_scid', undefined);
}, 10);
return true;
},
}, {
@@ -656,8 +680,20 @@ export default class SchemaDiffUI {
placeholder: gettext('Select database...'),
},
disabled: function(m) {
if (!_.isUndefined(m.get('target_sid')) && !_.isNull(m.get('target_sid')))
let self = this;
if (!_.isUndefined(m.get('target_sid')) && !_.isNull(m.get('target_sid'))
&& m.get('target_sid') !== '') {
setTimeout(function() {
if (self.options.length > 0) {
m.set('target_did', self.options[0].value);
}
}, 10);
return false;
}
setTimeout(function() {
m.set('target_did', undefined);
}, 10);
return true;
},
connect: function() {
@@ -678,8 +714,20 @@ export default class SchemaDiffUI {
placeholder: gettext('Select schema...'),
},
disabled: function(m) {
if (!_.isUndefined(m.get('target_did')) && !_.isNull(m.get('target_did')))
let self = this;
if (!_.isUndefined(m.get('target_did')) && !_.isNull(m.get('target_did'))
&& m.get('target_did') !== '') {
setTimeout(function() {
if (self.options.length > 0) {
m.set('target_scid', self.options[0].value);
}
}, 10);
return false;
}
setTimeout(function() {
m.set('target_scid', undefined);
}, 10);
return true;
},
}],