active_scaffold_export 3.9.2 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4efa340b028988b72b01057c337971ffa7afb17c6f84865992f9fc7f1be99a0
-  data.tar.gz: 2bd4bd6c5c5339cd8579127e9bbd39707adff96132ad61a4baf3ddba9f03745a
+  metadata.gz: '028314bd560c02524ab75e89fa886e1e6aa4e547fc2d897586ce8f512a33abb5'
+  data.tar.gz: 34b28d3afa5cc307d9728f59ea4a1b9e69ecd4fa66d27f3529d2e81da47801bc
 SHA512:
-  metadata.gz: 8f2b3155b131b1affb596f9002abc30252857a6ebc1454c73fcf8bf09ba330e246f6f158adb9357a9ec398bfd55d03489f8b2f990fa4b1e6b941404b4e1f854b
-  data.tar.gz: 644222fc4d6930a4d8f48f9b06365cc2be3098948e377335cc4b6ee3081208e9d94081220ba7ed3d15ac2c6d633f3313e3f3c4b5dbe86f3b7515510bf61bc00c
+  metadata.gz: f73011a115e19299e76b45eebc6abaa485ac3a86e57db94c3c96902ebe8fbc828f1e506de388a44791a671fc9018c88b6736f904bfe462804734ddff002b1689
+  data.tar.gz: d2f05275d642ea686552a01f29484ad108e2e16e18c0e1bb0e7ce66b33b3aee44adb2f2cf4c69d3f56d0b3436cb544ffdb67436cc3d967cf40f91095eda3f3ab

data/app/views/active_scaffold_overrides/_export_form_body.html.erb

@@ -5,9 +5,12 @@
  |
 <%= link_to as_(:select_none), '#', onclick: 'jQuery(".columnCheckbox").prop("checked", false); return false', class: 'active-scaffold-footer' %>
 <div class="columns checkbox-list">
-<% export_config.columns.each_column do |column| -%>
+<% export_columns_names(true).each_column do |column| -%>
   <div class="column checkbox-wrapper">
-    <%= content_tag(:label, check_box_tag("export_columns[#{column.name}]", 1, !export_config.default_deselected_columns.include?(column.name), :class => 'columnCheckbox') + "&nbsp;#{column.label}".html_safe) %>
+    <label>
+      <%= check_box_tag("export_columns[#{column.name}]", 1, !export_config.default_deselected_columns.include?(column.name), :class => 'columnCheckbox') %>
+      <%= column_heading_label(column) %>
+    </label>
   </div>
 <% end -%>
 &nbsp;

data/lib/active_scaffold/actions/export.rb

@@ -3,6 +3,7 @@ module ActiveScaffold::Actions
     def self.included(base)
       base.before_action :export_authorized?, :only => [:export]
       base.before_action :show_export_authorized?, :only => [:show_export]
+      base.helper_method :export_columns_names
     end
 
     # display the customization form or skip directly to export
@@ -23,7 +24,7 @@ module ActiveScaffold::Actions
       export_config = active_scaffold_config.export
       if params[:export_columns].nil?
         export_columns = {}
-        export_config.columns.each { |col| export_columns[col.to_sym] = 1 }
+        export_columns_names.each { |col| export_columns[col.to_sym] = 1 }
         options = {
           :export_columns => export_columns,
           :full_download => export_config.default_full_download.to_s,
@@ -33,21 +34,22 @@ module ActiveScaffold::Actions
         params.merge!(options)
       end
 
-      set_includes_for_columns(:export)
+      set_includes_for_columns(:export) # will call export_columns which will set @export_columns
       @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
       # with field_search against a relation column, and that relation column is
       # not included in the set of export columns.
       @list_columns = @export_columns
+      @page = find_page(find_options_for_export)
 
       # this is required if you want this to work with IE
       if request.env['HTTP_USER_AGENT'] =~ /msie/i
-        response.headers['Pragma'] = "public"
-        response.headers['Cache-Control'] = "no-cache, must-revalidate, post-check=0, pre-check=0"
-        response.headers['Expires'] = "0"
+        response.headers['pragma'] = "public"
+        response.headers['cache-control'] = "no-cache, must-revalidate, post-check=0, pre-check=0"
+        response.headers['expires'] = "0"
       end
-      response.headers['Content-Disposition'] = "attachment; filename=#{export_file_name}"
+      response.headers['content-disposition'] = "attachment; filename=#{export_file_name}"
 
       respond_to_action(:export)
     end
@@ -55,7 +57,8 @@ module ActiveScaffold::Actions
     protected
 
     def export_respond_to_csv
-      response.headers['Content-type'] = Mime[:csv]
+      response.headers['content-type'] = Mime[:csv]
+      response.headers['last-modified'] = '0'
       # start streaming output
       self.response_body = Enumerator.new do |y|
         find_items_for_export do |records|
@@ -68,7 +71,8 @@ module ActiveScaffold::Actions
     end
 
     def export_respond_to_xlsx
-      response.headers['Content-type'] = Mime[:xlsx]
+      response.headers['content-type'] = Mime[:xlsx]
+      response.headers['last-modified'] = '0'
       pkg = Axlsx::Package.new
       pkg.workbook.add_worksheet(name: worksheet_name) do |sheet|
         styles = @export_columns.collect { |column| view_context.export_column_header_style(column, :xlsx) }
@@ -109,39 +113,47 @@ module ActiveScaffold::Actions
 
     def export_columns
       return @export_columns if defined? @export_columns
-      @export_columns = active_scaffold_config.export.columns.reject { |col| params[:export_columns][col.to_sym].nil? }
+      @export_columns = export_columns_names.reject { |col| params[:export_columns][col.to_sym].nil? }
       sorting = active_scaffold_config.list.user.sorting || active_scaffold_config.list.sorting
       sorting_columns = sorting.reject { |col, _| @export_columns.include?(col.name) }.map(&:first)
       @export_columns.map! { |col| active_scaffold_config.columns[col] }
       @export_columns += sorting_columns
     end
 
-    # The actual algorithm to do the export
-    def find_items_for_export(&block)
-      find_options = { :sorting =>
-        active_scaffold_config.list.user.sorting.nil? ?
-          active_scaffold_config.list.sorting : active_scaffold_config.list.user.sorting,
-        :pagination => true
-      }
+    def export_columns_names(action_columns = false)
+      if grouped_search?
+        list_columns_names.then do |cols|
+          action_columns ? active_scaffold_config.build_action_columns(:export, cols) : cols
+        end
+      else
+        active_scaffold_config.export.columns
+      end
+    end
+
+    def find_options_for_export
+      find_options = {sorting: active_scaffold_config.list.sorting, pagination: true}
       do_search rescue nil
-      params[:segment_id] = session[:segment_id]
-      do_segment_search rescue nil
 
       if params[:full_download] == 'true'
-        find_options.merge!({
-          :per_page => 3000,
-          :page => 1
-        })
-        find_page(find_options).pager.each do |page|
+        find_options.merge!(per_page: 3000, page: 1)
+      else
+        find_options.merge!(
+          pagination: active_scaffold_config.list.pagination,
+          per_page: active_scaffold_config.list.user.per_page,
+          page: active_scaffold_config.list.user.page
+        )
+      end
+      find_options
+    end
+
+    # The actual algorithm to do the export
+    def find_items_for_export(&block)
+      if params[:full_download] == 'true'
+        @page.pager.each do |page|
           yield page.items
         end
       else
-        find_options.merge!({
-          :pagination => active_scaffold_config.list.pagination,
-          :per_page => active_scaffold_config.list.user.per_page,
-          :page => active_scaffold_config.list.user.page
-        })
-        yield find_page(find_options).items
+        yield @page.items
       end
     end
 

data/lib/active_scaffold/helpers/export_helpers.rb

@@ -16,6 +16,8 @@ module ActiveScaffold
         elsif column.list_ui && (method = override_export_ui(column.list_ui))
           value, options = send(method, record, column, format, ui_options: column.list_ui_options || column.options)
           [value, options || export_column_style(column, format)]
+        elsif grouped_search? && column == search_group_column && search_group_function
+          [format_grouped_search_column(record[column.name], column.options), export_column_style(column, format)]
         else
           raw_value = record.send(column.name)
 
@@ -39,7 +41,7 @@ module ActiveScaffold
       end
 
       def export_column_override(column)
-        override_helper column, 'export_column'
+        override_helper column, grouped_search? ? 'grouped_export_column' : 'export_column'
       end
 
       # the naming convention for overriding column types with helpers
@@ -81,7 +83,7 @@ module ActiveScaffold
       ## This helper can be overridden to change the name of the headers
       # For instance, you might want column.name.to_s.humanize
       def format_export_column_header_name(column)
-        column.label
+        column_heading_label column
       end
 
       ## This helper can be overridden to change the style of the headers

data/lib/active_scaffold_export/version.rb

@@ -1,8 +1,8 @@
 module ActiveScaffoldExport
   module Version
     MAJOR = 3
-    MINOR = 9
-    PATCH = 2
+    MINOR = 10
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_export
 version: !ruby/object:Gem::Version
-  version: 3.9.2
+  version: 3.10.0
 platform: ruby
 authors:
 - Volker Hochstein
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-23 00:00:00.000000000 Z
+date: 2025-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold