Skip to content
Merged
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
4 changes: 2 additions & 2 deletions lib/rails_admin/config/has_fields.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ def field(name, type = nil, add_to_section = true, &block)
field
end

# configure a field without adding it.
# configure field(s) from the default group in a section without changing the original order.
def configure(name, type = nil, &block)
field(name, type, false, &block)
[*name].each { |field_name| field(field_name, type, false, &block) }
end

# include fields by name and apply an optionnal block to each (through a call to fields),
Expand Down
38 changes: 29 additions & 9 deletions spec/rails_admin/config/has_fields_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,40 @@
expect(RailsAdmin.config(Team).fields.detect { |f| f.name == :players }.properties).not_to be_nil
end

it 'does not change the order of existing fields, if some field types of them are changed' do
original_fields_order = RailsAdmin.config(Team).fields.map(&:name)
describe '#configure' do
it 'does not change the order of existing fields, if some field types of them are changed' do
original_fields_order = RailsAdmin.config(Team).fields.map(&:name)

RailsAdmin.config do |config|
config.model Team do
configure :players, :enum do
enum { [] }
end
RailsAdmin.config do |config|
config.model Team do
configure :players, :enum do
enum { [] }
end

configure :revenue, :integer
configure :revenue, :integer
end
end

expect(RailsAdmin.config(Team).fields.map(&:name)).to eql(original_fields_order)
end

expect(RailsAdmin.config(Team).fields.map(&:name)).to eql(original_fields_order)
it 'allows passing multiple fields to share the same configuration' do
target_field_names = [:players, :revenue]

original_config = RailsAdmin.config(Team).fields.select { |field| target_field_names.include?(field.name) }
original_config.each { |field| expect(field).to be_visible }

RailsAdmin.config do |config|
config.model Team do
configure target_field_names do
visible false
end
end
end

updated_config = RailsAdmin.config(Team).fields.select { |field| target_field_names.include?(field.name) }
updated_config.each { |field| expect(field).to_not be_visible }
end
end

describe '#_fields' do
Expand Down