Skip to content

Commit 8b8c3a4

Browse files
committed
Rename delete_key to delete_value and keep_key to keep_value
for consistentency with cache_value. Refs. fb093e0
1 parent 834c83d commit 8b8c3a4

6 files changed

Lines changed: 13 additions & 11 deletions

File tree

app/views/rails_admin/main/_form_multiple_file_upload.html.haml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
%i.icon-white.icon-trash
77
= I18n.t('admin.actions.delete.menu').capitalize + " #{field.label.downcase} ##{i + 1}"
88
- if field.keep_method
9-
= form.check_box(field.keep_method, {multiple:true, checked: true, style: 'display:none;'}, attachment.keep_key, nil)
9+
= form.check_box(field.keep_method, {multiple:true, checked: true, style: 'display:none;'}, attachment.keep_value, nil)
1010
- elsif field.delete_method
11-
= form.check_box(field.delete_method, {multiple:true, style: 'display:none;'}, attachment.delete_key, nil)
11+
= form.check_box(field.delete_method, {multiple:true, style: 'display:none;'}, attachment.delete_value, nil)
1212

1313
= form.file_field(field.name, field.html_attributes.reverse_merge({ data: { :"multiple-fileupload" => true }, multiple: true }))
1414

lib/rails_admin/config/fields/types/multiple_active_storage.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class ActiveStorageAttachment < RailsAdmin::Config::Fields::Types::MultipleFileU
1212
{resize: '100x100>'}
1313
end
1414

15-
register_instance_option :delete_key do
15+
register_instance_option :delete_value do
1616
value.id
1717
end
1818

lib/rails_admin/config/fields/types/multiple_carrierwave.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ class CarrierwaveAttachment < RailsAdmin::Config::Fields::Types::MultipleFileUpl
1212
@thumb_method ||= ((versions = value.versions.keys).detect { |k| k.in?([:thumb, :thumbnail, 'thumb', 'thumbnail']) } || versions.first.to_s)
1313
end
1414

15-
register_instance_option :keep_key do
15+
register_instance_option :keep_value do
1616
value.cache_name || value.identifier
1717
end
1818

19-
register_instance_option :delete_key do
19+
register_instance_option :delete_value do
2020
value.file.filename
2121
end
2222

lib/rails_admin/config/fields/types/multiple_file_upload.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@ def initialize(value)
1919
nil
2020
end
2121

22-
register_instance_option :keep_key do
22+
register_instance_option :keep_value do
2323
nil
2424
end
2525

26-
register_instance_option :delete_key do
26+
register_instance_option :delete_value do
2727
nil
2828
end
2929

30+
register_deprecated_instance_option :delete_key, :delete_value
31+
3032
register_instance_option :pretty_value do
3133
if value.presence
3234
v = bindings[:view]

spec/rails_admin/config/fields/types/multiple_carrierwave_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
end
2727
end
2828

29-
describe '#delete_key', active_record: true do
29+
describe '#delete_value', active_record: true do
3030
before do
3131
RailsAdmin.config FieldTest do
3232
field :carrierwave_assets, :multiple_carrierwave
@@ -49,7 +49,7 @@
4949

5050
it 'does not use file.identifier, which is not available for Fog files' do
5151
expect_any_instance_of(CarrierWave::SanitizedFile).not_to receive :identifier
52-
expect(rails_admin_field.attachments.map(&:delete_key)).to eq ['dummy.gif']
52+
expect(rails_admin_field.attachments.map(&:delete_value)).to eq ['dummy.gif']
5353
end
5454
end
5555
end

spec/rails_admin/config/fields/types/multiple_file_upload_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def resource_url(thumb = false)
9595
RailsAdmin.config FieldTest do
9696
field :string_field, :multiple_file_upload do
9797
attachment do
98-
delete_key 'something'
98+
delete_value 'something'
9999

100100
def resource_url(_thumb = false)
101101
"http://example.com/#{value}"
@@ -118,7 +118,7 @@ def value
118118
end
119119

120120
it 'enables configuration' do
121-
expect(rails_admin_field.attachments.map(&:delete_key)).to eq ['something']
121+
expect(rails_admin_field.attachments.map(&:delete_value)).to eq ['something']
122122
expect(rails_admin_field.attachments.map(&:resource_url)).to eq ['http://example.com/foo.jpg']
123123
expect(rails_admin_field.pretty_value).to match(%r{src="http://example.com/foo.jpg"})
124124
end

0 commit comments

Comments
 (0)