Skip to content

Commit

Permalink
use set_includes_for_column
Browse files Browse the repository at this point in the history
  • Loading branch information
scambra committed Feb 8, 2016
1 parent e9f13f9 commit ce153f7
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions lib/active_scaffold/actions/export.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ def export
params.merge!(options)
end

@export_columns = export_config.columns.reject { |col| params[:export_columns][col.name.to_sym].nil? }
includes_for_export_columns = @export_columns.collect{ |col| col.includes }.flatten.uniq.compact
self.active_scaffold_includes.concat includes_for_export_columns
set_includes_for_columns(:export)
@export_config = export_config
# Make sure active_scaffold's find_page is dealing with the same list of
# columns. Prevents an invalid SQL query when exporting after filtering
Expand Down Expand Up @@ -97,6 +95,13 @@ def export
end

protected
def export_columns
@export_columns = active_scaffold_config.export.columns.reject { |col| params[:export_columns][col.name.to_sym].nil? }
sorting = active_scaffold_config.list.user.sorting || active_scaffold_config.list.sorting
sorting_columns = sorting.reject { |col, _| @export_columns.include?(col) }.map(&:first)
@export_columns + sorting_columns
end

# The actual algorithm to do the export
def find_items_for_export(&block)
find_options = { :sorting =>
Expand Down

0 comments on commit ce153f7

Please sign in to comment.