pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed couple of issues for the dashboard. 

- Filter for the grids were showing on the server level dashboard.
  It was regression of the commit-id: f7e43d5e5
- Mark 'is_server_dashboard', and 'is_database_dashboard' to false, when
  the node has its own dashboard URL defined.
pull/14/head
Ashesh Vashi 2018-07-30 13:33:17 +05:30
parent 0cb25bde63
commit c4267f0878
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/pgadmin/dashboard/static/js/dashboard.js
View File

@ -310,6 +310,8 @@ define('pgadmin.dashboard', [
} else {
is_server_dashboard = is_database_dashboard = false;
}
} else {
is_server_dashboard = is_database_dashboard = false;
}
var dashboardPanel = pgBrowser.panels['dashboard'].panel;
@ -802,10 +804,11 @@ define('pgadmin.dashboard', [
},
reflectPreferencesServer: function() {
var self = this;
var div_server_activity = $('.dashboard-container').find('#server_activity');
var div_server_locks = $('.dashboard-container').find('#server_locks');
var div_server_prepared = $('.dashboard-container').find('#server_prepared');
var div_server_config = $('.dashboard-container').find('#server_config');
var $dashboardContainer = $('.dashboard-container');
var div_server_activity = $dashboardContainer.find('#server_activity').get(0);
var div_server_locks = $dashboardContainer.find('#server_locks').get(0);
var div_server_prepared = $dashboardContainer.find('#server_prepared').get(0);
var div_server_config = $dashboardContainer.find('#server_config').get(0);
// Display server activity
if (self.preferences.show_activity) {