IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-04 13:17:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed potential issue in reset function for nested objects.

Browse Source 
Reset function clears the model instead of storing previous values.

Fixes #4895
This commit is contained in:
Ganesh Jaybhay 2019-11-05 14:47:07 +05:30 committed by Akshay Joshi
parent 570ee58f53
commit 69fba93152
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/en_US/release_notes_4_15.rst
View File

@ -39,4 +39,5 @@ Bug fixes
| `Issue #4734 <https://redmine.postgresql.org/issues/4734>`_ - Updated documentation for the delete row button that only strikeout the row instead of deleting it.
| `Issue #4779 <https://redmine.postgresql.org/issues/4779>`_ - Updated documentation for the query tool toolbar buttons.
| `Issue #4845 <https://redmine.postgresql.org/issues/4845>`_ - Fixed potential error in the properties dialog for the Code tab.
| `Issue #4850 <https://redmine.postgresql.org/issues/4850>`_ - Fixed an issue where Datetimepicker control opens when clicking on the label.
| `Issue #4850 <https://redmine.postgresql.org/issues/4850>`_ - Fixed an issue where Datetimepicker control opens when clicking on the label.
| `Issue #4895 <https://redmine.postgresql.org/issues/4895>`_ - Fixed potential issue in reset function for nested objects.

2
web/pgadmin/browser/static/js/collection.js
View File

@ -188,7 +188,7 @@ define([
'remove': function() {
if (this.grid) {
if (this.grid.collection) {
this.grid.collection.reset({silent: true});
this.grid.collection.reset([], {silent: true});
delete (this.grid.collection);
}
delete (this.grid);

19
web/pgadmin/browser/static/js/datamodel.js
View File

@ -283,11 +283,17 @@ define([
},
// Create a reset function, which allow us to remove the nested object.
reset: function(opts) {
var obj;
var obj,
reindex = !!(opts && opts.reindex);
if (opts && opts.stop)
this.stopSession();
// Let's not touch the child attributes, if reindex is false.
if (!reindex) {
return;
}
for (var id in this.objects) {
obj = this.get(id);
@ -297,7 +303,7 @@ define([
} else if (obj instanceof Backbone.Model) {
obj.clear(opts);
} else if (obj instanceof pgBrowser.DataCollection) {
obj.reset(opts);
obj.reset([], opts);
} else if (obj instanceof Backbone.Collection) {
obj.each(function(m) {
if (m instanceof Backbone.DataModel) {
@ -305,14 +311,11 @@ define([
obj.clear(opts);
}
});
if (!(opts instanceof Array)) {
opts = [opts];
}
Backbone.Collection.prototype.reset.apply(obj, opts);
Backbone.Collection.prototype.reset.call(obj, [], opts);
}
}
}
this.clear(opts);
Backbone.Collection.prototype.reset.apply(this, arguments);
},
sessChanged: function() {
var self = this;
@ -996,7 +999,7 @@ define([
},
// Override the reset function, so that - we can reset the model
// properly.
reset: function(opts) {
reset: function(_set, opts) {
if (opts && opts.stop)
this.stopSession();
this.each(function(m) {