diff --git a/app/views/rails_admin/main/dashboard.html.erb b/app/views/rails_admin/main/dashboard.html.erb
index b223897028..f123810dee 100644
--- a/app/views/rails_admin/main/dashboard.html.erb
+++ b/app/views/rails_admin/main/dashboard.html.erb
@@ -52,7 +52,7 @@
<% end %>
-<% if @auditing_adapter && authorized?(:history_index) %>
+<% if @history && authorized?(:history_index) %>
diff --git a/lib/rails_admin/config/actions/dashboard.rb b/lib/rails_admin/config/actions/dashboard.rb
index 9c910ee160..8218d305a1 100644
--- a/lib/rails_admin/config/actions/dashboard.rb
+++ b/lib/rails_admin/config/actions/dashboard.rb
@@ -18,7 +18,7 @@ class Dashboard < RailsAdmin::Config::Actions::Base
register_instance_option :controller do
proc do
- @history = @auditing_adapter&.latest(@action.auditing_versions_limit) || [] if @action.history?
+ @history = @auditing_adapter&.latest(@action.auditing_versions_limit) if @action.history?
if @action.statistics?
@abstract_models = RailsAdmin::Config.visible_models(controller: self).collect(&:abstract_model)
diff --git a/spec/integration/actions/dashboard_spec.rb b/spec/integration/actions/dashboard_spec.rb
index 2f7c572b92..7f329cfb8b 100644
--- a/spec/integration/actions/dashboard_spec.rb
+++ b/spec/integration/actions/dashboard_spec.rb
@@ -24,6 +24,28 @@
visit dashboard_path
end
+ it 'does not show history if turned off', active_record: true do
+ RailsAdmin.config do |c|
+ c.audit_with :paper_trail, 'User', 'PaperTrail::Version'
+ c.included_models = [PaperTrailTest]
+ c.actions do
+ dashboard do
+ history false
+ end
+ index # mandatory
+ new
+ history_index
+ end
+ end
+ with_versioning do
+ visit new_path(model_name: 'paper_trail_test')
+ fill_in 'paper_trail_test[name]', with: 'Jackie Robinson'
+ click_button 'Save'
+ end
+ visit dashboard_path
+ is_expected.not_to have_content 'Jackie Robinson'
+ end
+
it 'counts are different for same-named models in different modules' do
allow(RailsAdmin.config(User::Confirmed).abstract_model).to receive(:count).and_return(10)
allow(RailsAdmin.config(Comment::Confirmed).abstract_model).to receive(:count).and_return(0)