Skip to content

Commit 6228bcc

Browse files
author
Darío Javier Cravero
committed
Don't override :session_id setting if it's being set somewhere else when
the admin starts, see: #500 (comment)
1 parent 4b1ea34 commit 6228bcc

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

padrino-admin/lib/padrino-admin/access_control.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class << self
1313
# Method used by Padrino::Application when we register the extension
1414
#
1515
def registered(app)
16-
app.set :session_id, "_padrino_#{File.basename(Padrino.root)}_#{app.app_name}".to_sym
16+
app.set :session_id, "_padrino_#{File.basename(Padrino.root)}_#{app.app_name}".to_sym unless app.respond_to?(:session_id)
1717
app.set :admin_model, 'Account' unless app.respond_to?(:admin_model)
1818
app.helpers Padrino::Admin::Helpers::AuthenticationHelpers
1919
app.helpers Padrino::Admin::Helpers::ViewHelpers

padrino-admin/test/test_admin_application.rb

+20
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,26 @@ def setup
66
load_fixture 'data_mapper'
77
end
88

9+
describe "session id setting" do
10+
it "should provide it if it doesn't exist" do
11+
mock_app do
12+
register Padrino::Admin::AccessControl
13+
end
14+
15+
assert_equal @app.session_id, "_padrino_#{File.basename(Padrino.root)}_#{@app.app_name}".to_sym
16+
end
17+
18+
# it "should preserve it if it already existed" do
19+
# Padrino.configure_apps { enable :sessions; set :session_id, "foo" }
20+
21+
# mock_app do
22+
# register Padrino::Admin::AccessControl
23+
# end
24+
25+
# assert_equal @app.session_id, "foo"
26+
# end
27+
end
28+
929
it 'should require correctly login' do
1030
mock_app do
1131
register Padrino::Admin::AccessControl

0 commit comments

Comments
 (0)