From c4267f0878a95143a3ec271e1d2adee5596b1985 Mon Sep 17 00:00:00 2001 From: Ashesh Vashi Date: Mon, 30 Jul 2018 13:33:17 +0530 Subject: [PATCH] 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. --- web/pgadmin/dashboard/static/js/dashboard.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/web/pgadmin/dashboard/static/js/dashboard.js b/web/pgadmin/dashboard/static/js/dashboard.js index 3d8eca518..0294022db 100644 --- a/web/pgadmin/dashboard/static/js/dashboard.js +++ b/web/pgadmin/dashboard/static/js/dashboard.js @@ -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) {