Skip to content

Commit 90d8ac9

Browse files
committed
fix rubocop offenses
1 parent d577c30 commit 90d8ac9

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

lib/active_scaffold/actions/field_search.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,16 @@ def field_search_ignore?
206206
def setup_joins_for_filtered_columns(filtered_columns)
207207
if grouped_search? || active_scaffold_config.list.user.count_includes.present?
208208
active_scaffold_outer_joins.concat filtered_columns.map(&:search_joins).flatten.uniq.compact
209-
if grouped_search? && search_group_column&.search_joins.present? && filtered_columns.exclude?(search_group_column)
210-
active_scaffold_joins << search_group_column.search_joins
211-
end
209+
active_scaffold_joins << search_group_column.search_joins if grouped_column_needs_joins?(filtered_columns)
212210
else
213211
set_outer_joins_for_search filtered_columns
214212
end
215213
end
216214

215+
def grouped_column_needs_joins?(filtered_columns)
216+
grouped_search? && search_group_column&.search_joins.present? && filtered_columns.exclude?(search_group_column)
217+
end
218+
217219
def field_search_formats
218220
(default_formats + active_scaffold_config.formats + active_scaffold_config.field_search.formats).uniq
219221
end

lib/active_scaffold/finder.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,12 +517,12 @@ def active_scaffold_joins
517517
end
518518

519519
def active_scaffold_habtm_joins
520-
ActiveScaffold.deprecator.warn "use active_scaffold_joins"
520+
ActiveScaffold.deprecator.warn 'use active_scaffold_joins'
521521
active_scaffold_joins
522522
end
523523

524524
def active_scaffold_habtm_joins=(value)
525-
ActiveScaffold.deprecator.warn "use active_scaffold_joins="
525+
ActiveScaffold.deprecator.warn 'use active_scaffold_joins='
526526
self.active_scaffold_joins = value
527527
end
528528

0 commit comments

Comments
 (0)