From 657c2da528e2947e2d2a551c4c48510cc66715b8 Mon Sep 17 00:00:00 2001 From: ObiWanKeoni Date: Thu, 9 Jan 2025 17:36:18 -0800 Subject: [PATCH] Rubocop --- lib/avo/concerns/has_field_discovery.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/avo/concerns/has_field_discovery.rb b/lib/avo/concerns/has_field_discovery.rb index 1dc782346..780a0250f 100644 --- a/lib/avo/concerns/has_field_discovery.rb +++ b/lib/avo/concerns/has_field_discovery.rb @@ -190,23 +190,26 @@ def discover_by_type(associations, as_type) end def discover_rich_texts - rich_texts.each do |association_name, reflection| + rich_texts.each_key do |association_name| next unless column_in_scope?(association_name) - field_name = association_name&.to_s&.delete_prefix('rich_text_').to_sym || association_name + field_name = association_name&.to_s&.delete_prefix('rich_text_')&.to_sym || association_name field field_name, as: :trix, **@field_options end end def discover_tags - tags.each do |association_name, reflection| + tags.each_key do |association_name| next unless column_in_scope?(association_name) - field_name = association_name&.to_s&.delete_suffix('_taggings').pluralize.to_sym || association_name - field field_name, as: :tags, **@field_options.merge(acts_as_taggable_on: field_name) + field tag_field_name(association_name), as: :tags, **@field_options.merge(acts_as_taggable_on: field_name) end end + def tag_field_name(association_name) + association_name&.to_s&.delete_suffix('_taggings')&.pluralize&.to_sym || association_name + end + def discover_attachments attachment_associations.each do |association_name, reflection| next unless column_in_scope?(association_name)