tramway-export 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99c1c96295830ed89b78703601a271c2f97b86e74a9861b6c1ae195b6b9eb11c
-  data.tar.gz: 7fc5cb109af932fb9f9e58121d1af6dbcd8fef51d554a0c62f47695b89ef7182
+  metadata.gz: af9b78d49eec7bcdbcf6b11f6c173748d889c209dee386ec33f318b643436fa8
+  data.tar.gz: 3c1546aed1ee45a57546ecc5f32a2161c306fdf580227ade54425f3afd895957
 SHA512:
-  metadata.gz: b737162f887a2723004983a7831dbefe50f55b1dbf36d594210d28156e2b9fe6cd8ebd7825342fd0c9bc6570f0b68d4e91f21adced0eb33f4309686b7746d4ea
-  data.tar.gz: 85494e426307467abe02c7e9753d62fd713b346866cfbb17f82962e3fbd18e71cd19206919ae0eb78e9efc797e32a39c4a70b08776ea002a5565b853340ab697
+  metadata.gz: 633a6472e18d8142213e8c4cbe64dc8959a05cf8ac1ef38ac2853df4d200cc651f33feaf24b3625e3ba9dfdbda7a114840ed67697ad9f4a769caf030192ee46b
+  data.tar.gz: 9cc083bf8bf268bb4512b4ea103624ca52b55eb2321fa329b3ef2bf358ae9e46da63ecf6e742179744a495c6be4606e458caa98f8dbfa4ed339c057f08892a9c

data/app/controllers/tramway/export/exports_controller.rb

@@ -8,14 +8,18 @@ class Tramway::Export::ExportsController < Tramway::Admin::ApplicationController
     model_class = model_class_name(params[:model])
     xls_decorator_class = xls_decorator_class_name(params[:model])
     records = model_class.active.order(id: :desc).send scope
-    records = records.ransack(params[:filter]).result if params[:filter]
+    records = records.ransack(params[:filter]).result if params[:filter].present?
     records = records.send "#{current_user.role}_scope", current_user.id
     records = xls_decorator_class.decorate records
 
+    columns = xls_decorator_class.columns + records.map(&:flexible_columns).flatten.uniq do |hash|
+      hash&.keys&.first
+    end
+
     book = ::XlsExporter.export do
       add_sheet 'List'
 
-      export_models records, *xls_decorator_class.columns
+      export_models records, *columns
     end
     stream = StringIO.new
     book.write stream

data/app/views/tramway/export/_button.html.haml

@@ -6,5 +6,4 @@
       = fa_icon(:download)
     .dropdown-menu{ aria: { labelledby: id } }
       - decorator_class.collections.each do |collection|
-        = link_to collection_human_name(model_name: model_name, collection_name: collection), Tramway::Export::Engine.routes.url_helpers.exports_path(model: model_class, scope: collection, filter: params[:filter].permit!), class: 'dropdown-item'
-
+        = link_to collection_human_name(model_name: model_name, collection_name: collection), Tramway::Export::Engine.routes.url_helpers.exports_path(model: model_class, scope: collection, filter: params[:filter]&.permit!), class: 'dropdown-item'

data/lib/tramway/export/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Export
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-export
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xls_exporter