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

Fixed TypeError exception in schema diff when selected any identical object. Fixes #6084

Browse Source
This commit is contained in:
Rahul Shirsat 2020-12-21 15:06:01 +05:30 committed by Akshay Joshi
parent a0ff0e30fb
commit ed5fc20ee2
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_4_30.rst
View File

@ -25,3 +25,4 @@ Bug fixes
| `Issue #6046 <https://redmine.postgresql.org/issues/6046>`_ - Fixed an issue where the state of the Save File icon does not match the dirty editor indicator. | `Issue #6046 <https://redmine.postgresql.org/issues/6046>`_ - Fixed an issue where the state of the Save File icon does not match the dirty editor indicator.
| `Issue #6047 <https://redmine.postgresql.org/issues/6047>`_ - Fixed an issue where the dirty indicator stays active even if all changes were undone. | `Issue #6047 <https://redmine.postgresql.org/issues/6047>`_ - Fixed an issue where the dirty indicator stays active even if all changes were undone.
| `Issue #6058 <https://redmine.postgresql.org/issues/6058>`_ - Ensure that the rename panel should be disabled when the SQL file opened in the query tool. | `Issue #6058 <https://redmine.postgresql.org/issues/6058>`_ - Ensure that the rename panel should be disabled when the SQL file opened in the query tool.
| `Issue #6084 <https://redmine.postgresql.org/issues/6084>`_ - Fixed TypeError exception in schema diff when selected any identical object.

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

@ -456,7 +456,9 @@ export default class SchemaDiffUI {
grid.onSelectedRowsChanged.subscribe(self.handleDependencies.bind(this)); grid.onSelectedRowsChanged.subscribe(self.handleDependencies.bind(this));
self.model.on('change:diff_ddl', self.handleDependencies.bind(self)); self.model.on('change:diff_ddl', function(event) {
self.handleDependencies.bind(event, self);
});
$('#schema-diff-grid').on('keyup', function() { $('#schema-diff-grid').on('keyup', function() {
if ((event.keyCode == 38 || event.keyCode ==40) && this.grid.getActiveCell().row) { if ((event.keyCode == 38 || event.keyCode ==40) && this.grid.getActiveCell().row) {
@ -831,9 +833,13 @@ export default class SchemaDiffUI {
} }
} }
}); });
// Check whether comparison data is loaded or not
if(!_.isUndefined(self.dataView) && !_.isNull(self.dataView)) {
// Refresh the grid // Refresh the grid
self.dataView.refresh(); self.dataView.refresh();
} }
}
connect_database(server_id, db_id, callback) { connect_database(server_id, db_id, callback) {
var url = url_for('schema_diff.connect_database', {'sid': server_id, 'did': db_id}); var url = url_for('schema_diff.connect_database', {'sid': server_id, 'did': db_id});