From fd36117b416e1190334d108058dc0c16ef24e964 Mon Sep 17 00:00:00 2001 From: radhika Date: Tue, 11 Oct 2016 10:08:45 -0400 Subject: [PATCH] 10078: Rename the workbench config param 'show_user_notifications_on_dashboard' as 'show_user_notifications' because they are in topnav, not on dashboard! --- apps/workbench/app/controllers/application_controller.rb | 2 +- apps/workbench/config/application.default.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb index 3b6c89ec0e..9da1d78003 100644 --- a/apps/workbench/app/controllers/application_controller.rb +++ b/apps/workbench/app/controllers/application_controller.rb @@ -769,7 +769,7 @@ class ApplicationController < ActionController::Base helper_method :user_notifications def user_notifications - return [] if @errors or not current_user.andand.is_active or not Rails.configuration.show_user_notifications_on_dashboard + return [] if @errors or not current_user.andand.is_active or not Rails.configuration.show_user_notifications @notifications ||= @@notification_tests.map do |t| t.call(self, current_user) end.compact diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml index ed2683d81a..e4e2782986 100644 --- a/apps/workbench/config/application.default.yml +++ b/apps/workbench/config/application.default.yml @@ -281,8 +281,8 @@ common: # and display in the Log tab, while subscribing to web sockets. running_job_log_records_to_fetch: 2000 - # In systems with many shared projects, dashboard loading can be - # slow due to collections indexing; use the following parameters - # to suppress certain properties from dashboard + # In systems with many shared projects, loading of dashboard and topnav + # cab be slow due to collections indexing; use the following parameters + # to suppress these properties show_recent_collections_on_dashboard: true - show_user_notifications_on_dashboard: true + show_user_notifications: true -- 2.30.2