tramway-export 0.2.0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 797b8646f1afd946efe3b2926e75d95f056b6dd190d8424357e5b78c06bf70b9
-  data.tar.gz: 1ff12e2b514aa49dec363ebb473276df849f3504dbfd693ec29c8333424ca15f
+  metadata.gz: bd13981fdb5e8efaf10ca1d0f2ae38affb27920f456c19e293bf831ef151469e
+  data.tar.gz: f7553ceb6c55fdcaa5f5970345dbd677873ec2ca2eb4e2e21a434e23f03f5c1c
 SHA512:
-  metadata.gz: 7faa2448f27af2740baafc8ec75c32c5b545098c4955f237696213a41ce8a4e03a298e4994169fd29773e01184768f614d3b31828087eb1c58baac388e449c9d
-  data.tar.gz: bc1e60703f934e9803d1c9e345bf6ef9576e0401c7407918894cd1865190ab29ef0a20f93667c45cc16d00cf4a98377cd3ea1c5efde3b5b08d37e44fe8de1cd6
+  metadata.gz: 526d31a70858f63528eb448b5f502322952c184740e8952c97b0f5850831a076278b14488b0602080a211c3ba405030f3481af476ac8503d34ccd581e9322688
+  data.tar.gz: ef4ccfd2ae44b7440d3ae876509c2bcf30aa264e60192db92ace2b64adcce46b4409070ef130f7bde9b2814625cd330a6b052586906c64eec3c36965f3278236

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

@@ -7,7 +7,7 @@ class Tramway::Export::ExportsController < Tramway::Admin::ApplicationController
     scope = params[:scope].present? ? params[:scope] : :all
     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 = model_class.order(id: :desc).send scope
     records = records.ransack(params[:filter]).result if params[:filter].present?
     records = records.send "#{current_admin.role}_scope", current_admin.id
     records = xls_decorator_class.decorate records
@@ -33,7 +33,7 @@ class Tramway::Export::ExportsController < Tramway::Admin::ApplicationController
 
     model_class = model_class_name(params[:model])
     xls_collection_decorator_class = xls_collection_decorator_class_name(params[:model], params[:collection])
-    records = model_class.find(params[:id]).send(params[:collection]).active.order(id: :desc)
+    records = model_class.find(params[:id]).send(params[:collection]).order(id: :desc)
     records = records.send "#{current_admin.role}_scope", current_admin.id
     records = xls_collection_decorator_class.decorate records
 

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

@@ -2,8 +2,6 @@
   - model_name = model_class.name.underscore
   - id = "export-#{model_name.gsub('/', '_')}"
   .btn-group{ role: :group }
-    %button{ id: id, type: :button, class: 'btn btn-primary dropdown-toggle', data: { toggle: :dropdown, aria: { haspopup: :true, expanded: :false } } }
-      = 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].present? ? params[:filter].permit! : nil), class: 'dropdown-item'
+    - decorator_class.collections.each do |collection|
+      = link_to Tramway::Export::Engine.routes.url_helpers.exports_path(model: model_class, scope: collection, filter: params[:filter].present? ? params[:filter].permit! : nil), class: 'btn btn-primary' do
+        = collection_human_name(model_name: model_name, collection_name: collection)

data/lib/tramway/export/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Export
-    VERSION = '0.2.0.2'
+    VERSION = '0.2.1'
   end
 end

data/lib/tramway/export.rb

@@ -18,7 +18,7 @@ module Tramway
       def exportable_model?(model_class, project:)
         return false unless project.present?
 
-        @exportable_models[project.to_sym].map(&:to_s)&.include?(model_class.to_s) ||
+        @exportable_models[project.to_sym]&.map(&:to_s)&.include?(model_class.to_s) ||
           @exportable_models[project.to_sym]&.map { |config| config.is_a?(Hash) && config.keys.first.to_s == model_class.to_s }&.include?(true)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-export
 version: !ruby/object:Gem::Version
-  version: 0.2.0.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xls_exporter
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Rails engine for exporting data