Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion app/controllers/administrate/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def show
end

def new
@resource = resource = new_resource.tap do |resource|
@resource = resource = new_resource(new_resource_params).tap do |resource|
authorize_resource(resource)
end

Expand Down Expand Up @@ -217,6 +217,14 @@ def apply_collection_includes(relation)
relation.includes(*resource_includes)
end

def new_resource_params
if params.key?(resource_class.model_name.param_key)
resource_params
else
{}
end
end

def resource_params
params.require(resource_class.model_name.param_key)
.permit(dashboard.permitted_attributes(action_name))
Expand Down
8 changes: 8 additions & 0 deletions spec/controllers/admin/blog/posts_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@

expect(locals[:page]).to be_instance_of(Administrate::Page::Form)
end

it "prefills the new namespaced resource from params" do
locals = capture_view_locals do
get :new, params: {blog_post: {title: "Hello"}}
end

expect(locals[:page].resource.title).to eq("Hello")
end
end

describe "GET edit" do
Expand Down
18 changes: 18 additions & 0 deletions spec/controllers/admin/customers_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,24 @@ def default_sorting_direction

expect(locals[:page]).to be_instance_of(Administrate::Page::Form)
end

it "builds a new resource without params" do
locals = capture_view_locals { get :new }

expect(locals[:page].resource).to be_a_new(Customer)
expect(locals[:page].resource.name).to be_nil
end

it "prefills the new resource from params" do
locals = capture_view_locals do
get :new, params: {customer: {name: "Bob", email: "bob@example.com"}}
end

resource = locals[:page].resource
expect(resource).to be_a_new(Customer)
expect(resource.name).to eq("Bob")
expect(resource.email).to eq("bob@example.com")
end
end

describe "GET edit" do
Expand Down