Skip to content

Fix inheritance of parent_controller when controllers were eagerly loaded #3458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mshibuya merged 1 commit into from
Jan 24, 2022
Merged

Fix inheritance of parent_controller when controllers were eagerly loaded #3458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/rails_admin/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,16 @@ def default_hidden_fields=(fields)

def parent_controller=(name)
@parent_controller = name

if defined?(RailsAdmin::ApplicationController)
RailsAdmin.send(:remove_const, :ApplicationController)
load RailsAdmin::Engine.root.join('app/controllers/rails_admin/application_controller.rb')
end

if defined?(RailsAdmin::MainController)
RailsAdmin.send(:remove_const, :MainController)
load RailsAdmin::Engine.root.join('app/controllers/rails_admin/main_controller.rb')
end
end

def total_columns_width=(_)
Expand Down
6 changes: 6 additions & 0 deletions spec/rails_admin/config_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,11 @@ class TestController < ActionController::Base; end

describe '.parent_controller=' do
context 'if RailsAdmin::ApplicationController is already loaded' do
before do
# preload cotrollers (e.g. when config.eager_load = true)
RailsAdmin::MainController
end

after do
RailsAdmin::Config.reset
RailsAdmin.send(:remove_const, :ApplicationController)
Expand All @@ -292,6 +297,7 @@ class TestController < ActionController::Base; end
it 'can be changed' do
RailsAdmin.config.parent_controller = 'ApplicationController'
expect(RailsAdmin::ApplicationController.superclass).to eq ApplicationController
expect(RailsAdmin::MainController.superclass.superclass).to eq ApplicationController
end
end
end
Expand Down
⚡