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

Fixed an issue where the properties tab for collection nodes is unresponsive after switching the tabs. Fixes #4959

Browse Source
This commit is contained in:
Nikhil Mohite 2021-02-26 12:45:06 +05:30 committed by Akshay Joshi
parent 8279e7e01c
commit 4fc36a9053
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_5_1.rst
View File

@ -17,4 +17,5 @@ Housekeeping
Bug fixes Bug fixes
********* *********
| `Issue #4959 <https://redmine.postgresql.org/issues/4959>`_ - Fixed an issue where the properties tab for collection nodes is unresponsive after switching the tabs.
| `Issue #6159 <https://redmine.postgresql.org/issues/6159>`_ - Ensure that the user should be able to kill the session from Dashboard if the user has a 'pg_signal_backend' role. | `Issue #6159 <https://redmine.postgresql.org/issues/6159>`_ - Ensure that the user should be able to kill the session from Dashboard if the user has a 'pg_signal_backend' role.

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

@ -190,6 +190,14 @@ define([
gridSchema.columns.forEach((col)=>{ gridSchema.columns.forEach((col)=>{
col.disabled = true; col.disabled = true;
}); });
// Get the list of selected models, before initializing the grid
// again.
var selectedModels = [];
if(!_.isUndefined(that.grid) && 'collection' in that.grid){
selectedModels = that.grid.getSelectedModels();
}
// Initialize a new Grid instance // Initialize a new Grid instance
that.grid = new Backgrid.Grid({ that.grid = new Backgrid.Grid({
emptyText: gettext('No data found'), emptyText: gettext('No data found'),
@ -213,12 +221,6 @@ define([
}; };
if (view) { if (view) {
// Avoid unnecessary reloads
if (_.isEqual($(panel).data('node-prop'), urlBase)) {
return;
}
// Cache the current IDs for next time // Cache the current IDs for next time
$(panel).data('node-prop', urlBase); $(panel).data('node-prop', urlBase);
@ -316,6 +318,18 @@ define([
// Listen to select all checkbox event // Listen to select all checkbox event
that.collection.on('backgrid:select-all', that.__loadAllRows.bind(that)); that.collection.on('backgrid:select-all', that.__loadAllRows.bind(that));
// Trigger the backgrid:select event for already selected items
// as we have created a new grid instance.
if(selectedModels.length > 0) {
that.collection.each(function (model) {
for(var inx=0; inx < selectedModels.length; inx++){
if (selectedModels[inx].id == model.id){
model.trigger('backgrid:select', model, true);
}
}
});
}
} else { } else {
// Do not listen the scroll event // Do not listen the scroll event
$('.pg-prop-content').off('scroll', that.__loadMoreRows); $('.pg-prop-content').off('scroll', that.__loadMoreRows);
@ -323,6 +337,7 @@ define([
$msgContainer.text(gettext('No properties are available for the selected object.')); $msgContainer.text(gettext('No properties are available for the selected object.'));
} }
selectedModels = [];
}).fail(function(xhr, error) { }).fail(function(xhr, error) {
pgBrowser.Events.trigger( pgBrowser.Events.trigger(
'pgadmin:node:retrieval:error', 'properties', xhr, error.message, item, that 'pgadmin:node:retrieval:error', 'properties', xhr, error.message, item, that