From 4a4310ad57634783204c09b1c7b81ce4a66f77ff Mon Sep 17 00:00:00 2001 From: emmanueldd Date: Mon, 14 Mar 2016 11:12:36 +0100 Subject: [PATCH 01/13] max_csv_records = 2000 --- lib/active_admin/axlsx/resource_controller_extension.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/active_admin/axlsx/resource_controller_extension.rb b/lib/active_admin/axlsx/resource_controller_extension.rb index 5e002e4..c6f153d 100644 --- a/lib/active_admin/axlsx/resource_controller_extension.rb +++ b/lib/active_admin/axlsx/resource_controller_extension.rb @@ -19,10 +19,11 @@ def index_with_xlsx(options={}, &block) # patching per_page to use the CSV record max for pagination when the format is xlsx def per_page_with_xlsx - if request.format == Mime::Type.lookup_by_extension(:xlsx) - return max_csv_records - end - per_page_without_xlsx + max_csv_records = 2000 + if request.format == Mime::Type.lookup_by_extension(:xlsx) + return max_csv_records + end + per_page_without_xlsx end # Returns a filename for the xlsx file using the collection_name From 7d8b9437400045223915ef7b12344bda24a95bb9 Mon Sep 17 00:00:00 2001 From: emmanueldd Date: Thu, 8 Sep 2016 11:57:45 +0200 Subject: [PATCH 02/13] Remove options in index_without_xlsx --- lib/active_admin/axlsx/resource_controller_extension.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/active_admin/axlsx/resource_controller_extension.rb b/lib/active_admin/axlsx/resource_controller_extension.rb index c6f153d..6fa60b3 100644 --- a/lib/active_admin/axlsx/resource_controller_extension.rb +++ b/lib/active_admin/axlsx/resource_controller_extension.rb @@ -8,8 +8,8 @@ def self.included(base) end # patching the index method to allow the xlsx format. - def index_with_xlsx(options={}, &block) - index_without_xlsx(options) do |format| + def index_with_xlsx(&block) + index_without_xlsx do |format| format.xlsx do xlsx = active_admin_config.xlsx_builder.serialize(collection) send_data xlsx, :filename => "#{xlsx_filename}", :type => Mime::Type.lookup_by_extension(:xlsx) From 8a67cded5ee21557bd511839e4461ed2c394a892 Mon Sep 17 00:00:00 2001 From: emmanueldd Date: Thu, 8 Sep 2016 12:08:51 +0200 Subject: [PATCH 03/13] update activeadmin dependancies --- Gemfile.lock | 2 +- activeadmin-axlsx.gemspec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index db0e980..291a881 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: activeadmin-axlsx (3.0.0) - activeadmin (~> 0.6.0) + activeadmin (~> 1.0.0) axlsx GEM diff --git a/activeadmin-axlsx.gemspec b/activeadmin-axlsx.gemspec index 94ea552..6003ddd 100644 --- a/activeadmin-axlsx.gemspec +++ b/activeadmin-axlsx.gemspec @@ -13,11 +13,11 @@ Gem::Specification.new do |s| s.description = <<-eof This gem uses axlsx to provide excel/xlsx downloads for resources in Active Admin. Often, users are happier with excel, so why not give it to them instead of CSV? eof - s.files = `git ls-files`.split("\n").sort + s.files = `git ls-files`.split("\n").sort s.test_files = `git ls-files -- {spec}/*`.split("\n") s.test_files = Dir.glob("{spec/**/*}") - s.add_runtime_dependency 'activeadmin', "~> 0.6.0" + s.add_runtime_dependency 'activeadmin', "~> 1.0.0" s.add_runtime_dependency 'axlsx' s.required_ruby_version = '>= 1.9.2' From ce06b9ad0a7e6178e7e9060ba2a90dcfba946be2 Mon Sep 17 00:00:00 2001 From: emmanueldd Date: Thu, 8 Sep 2016 12:10:34 +0200 Subject: [PATCH 04/13] update activeadmin dependancies --- Gemfile.lock | 2 +- activeadmin-axlsx.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 291a881..76e8bca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: activeadmin-axlsx (3.0.0) - activeadmin (~> 1.0.0) + activeadmin (=> 1.0.0.pre2) axlsx GEM diff --git a/activeadmin-axlsx.gemspec b/activeadmin-axlsx.gemspec index 6003ddd..f400c51 100644 --- a/activeadmin-axlsx.gemspec +++ b/activeadmin-axlsx.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.test_files = `git ls-files -- {spec}/*`.split("\n") s.test_files = Dir.glob("{spec/**/*}") - s.add_runtime_dependency 'activeadmin', "~> 1.0.0" + s.add_runtime_dependency 'activeadmin', "=> 1.0.0.pre2" s.add_runtime_dependency 'axlsx' s.required_ruby_version = '>= 1.9.2' From 5df2366c3b3afe382f305dce0e9cec6d4ffb2514 Mon Sep 17 00:00:00 2001 From: emmanueldd Date: Thu, 8 Sep 2016 12:11:24 +0200 Subject: [PATCH 05/13] update activeadmin dependancies --- Gemfile.lock | 2 +- activeadmin-axlsx.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 76e8bca..d6ce6fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: activeadmin-axlsx (3.0.0) - activeadmin (=> 1.0.0.pre2) + activeadmin (>= 1.0.0.pre2) axlsx GEM diff --git a/activeadmin-axlsx.gemspec b/activeadmin-axlsx.gemspec index f400c51..26745b8 100644 --- a/activeadmin-axlsx.gemspec +++ b/activeadmin-axlsx.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.test_files = `git ls-files -- {spec}/*`.split("\n") s.test_files = Dir.glob("{spec/**/*}") - s.add_runtime_dependency 'activeadmin', "=> 1.0.0.pre2" + s.add_runtime_dependency 'activeadmin', ">= 1.0.0.pre2" s.add_runtime_dependency 'axlsx' s.required_ruby_version = '>= 1.9.2' From bc16c0a09572e4956ace69ffe8f11fae5b74db6e Mon Sep 17 00:00:00 2001 From: emmanueldd Date: Thu, 8 Sep 2016 15:53:51 +0200 Subject: [PATCH 06/13] update --- lib/active_admin/axlsx.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/active_admin/axlsx.rb b/lib/active_admin/axlsx.rb index 545c426..9dfee06 100644 --- a/lib/active_admin/axlsx.rb +++ b/lib/active_admin/axlsx.rb @@ -25,5 +25,3 @@ class Railtie < ::Rails::Railtie ActiveAdmin::ResourceController.send :include, ActiveAdmin::Axlsx::ResourceControllerExtension end end - - From 6eed1d7d6aa50e3d3e0cf0de93912582675ff49f Mon Sep 17 00:00:00 2001 From: emmanueldd Date: Thu, 8 Sep 2016 15:55:44 +0200 Subject: [PATCH 07/13] update --- lib/active_admin/axlsx.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/active_admin/axlsx.rb b/lib/active_admin/axlsx.rb index 9dfee06..0d7536a 100644 --- a/lib/active_admin/axlsx.rb +++ b/lib/active_admin/axlsx.rb @@ -16,9 +16,7 @@ class Railtie < ::Rails::Railtie # noop end - end - config.after_initialize do ActiveAdmin::ResourceDSL.send :include, ActiveAdmin::Axlsx::DSL ActiveAdmin::Resource.send :include, ActiveAdmin::Axlsx::ResourceExtension ActiveAdmin::Views::PaginatedCollection.add_format :xlsx From f20bc9070dc1b9e896a3ce82c0dd3992cbbe92f3 Mon Sep 17 00:00:00 2001 From: emmanueldd Date: Thu, 8 Sep 2016 15:56:25 +0200 Subject: [PATCH 08/13] update --- lib/active_admin/axlsx.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/active_admin/axlsx.rb b/lib/active_admin/axlsx.rb index 0d7536a..9dfee06 100644 --- a/lib/active_admin/axlsx.rb +++ b/lib/active_admin/axlsx.rb @@ -16,7 +16,9 @@ class Railtie < ::Rails::Railtie # noop end + end + config.after_initialize do ActiveAdmin::ResourceDSL.send :include, ActiveAdmin::Axlsx::DSL ActiveAdmin::Resource.send :include, ActiveAdmin::Axlsx::ResourceExtension ActiveAdmin::Views::PaginatedCollection.add_format :xlsx From aea36b194a0ae217cea50c6943cfeeefcbb288f9 Mon Sep 17 00:00:00 2001 From: emmanueldd Date: Thu, 8 Sep 2016 17:14:35 +0200 Subject: [PATCH 09/13] update --- lib/active_admin/axlsx.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/active_admin/axlsx.rb b/lib/active_admin/axlsx.rb index 9dfee06..2640078 100644 --- a/lib/active_admin/axlsx.rb +++ b/lib/active_admin/axlsx.rb @@ -15,10 +15,6 @@ class Railtie < ::Rails::Railtie rescue NameError # noop end - - end - - config.after_initialize do ActiveAdmin::ResourceDSL.send :include, ActiveAdmin::Axlsx::DSL ActiveAdmin::Resource.send :include, ActiveAdmin::Axlsx::ResourceExtension ActiveAdmin::Views::PaginatedCollection.add_format :xlsx From 03d82792f9c197b8b5d53d1018e6ebbdfadc675b Mon Sep 17 00:00:00 2001 From: emmanueldd Date: Tue, 20 Mar 2018 10:53:11 +0100 Subject: [PATCH 10/13] update --- lib/active_admin/axlsx/resource_controller_extension.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/active_admin/axlsx/resource_controller_extension.rb b/lib/active_admin/axlsx/resource_controller_extension.rb index 6fa60b3..4fd7150 100644 --- a/lib/active_admin/axlsx/resource_controller_extension.rb +++ b/lib/active_admin/axlsx/resource_controller_extension.rb @@ -1,6 +1,9 @@ +require "active_support" module ActiveAdmin module Axlsx module ResourceControllerExtension + + def self.included(base) base.send :alias_method_chain, :per_page, :xlsx base.send :alias_method_chain, :index, :xlsx From 3924420086deeff882023ddfb7c2ac4774670e7f Mon Sep 17 00:00:00 2001 From: emmanueldd Date: Tue, 20 Mar 2018 10:59:09 +0100 Subject: [PATCH 11/13] update --- lib/active_admin/axlsx/resource_controller_extension.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/active_admin/axlsx/resource_controller_extension.rb b/lib/active_admin/axlsx/resource_controller_extension.rb index 4fd7150..e08f73f 100644 --- a/lib/active_admin/axlsx/resource_controller_extension.rb +++ b/lib/active_admin/axlsx/resource_controller_extension.rb @@ -1,8 +1,7 @@ -require "active_support" module ActiveAdmin module Axlsx module ResourceControllerExtension - + require "active_support" def self.included(base) base.send :alias_method_chain, :per_page, :xlsx From 5dd609e66fcacede1ce2ce7772a28654d4dbd581 Mon Sep 17 00:00:00 2001 From: emmanueldd Date: Tue, 20 Mar 2018 11:06:57 +0100 Subject: [PATCH 12/13] update --- lib/active_admin/axlsx/resource_controller_extension.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/active_admin/axlsx/resource_controller_extension.rb b/lib/active_admin/axlsx/resource_controller_extension.rb index e08f73f..cce7cd5 100644 --- a/lib/active_admin/axlsx/resource_controller_extension.rb +++ b/lib/active_admin/axlsx/resource_controller_extension.rb @@ -4,8 +4,8 @@ module ResourceControllerExtension require "active_support" def self.included(base) - base.send :alias_method_chain, :per_page, :xlsx - base.send :alias_method_chain, :index, :xlsx + # base.send :alias_method_chain, :per_page, :xlsx + # base.send :alias_method_chain, :index, :xlsx base.send :respond_to, :xlsx end From c001614d43601a1ed567944a07e4907ed06b6d1c Mon Sep 17 00:00:00 2001 From: emmanueldd Date: Tue, 20 Mar 2018 11:36:19 +0100 Subject: [PATCH 13/13] update --- lib/active_admin/axlsx/resource_controller_extension.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/active_admin/axlsx/resource_controller_extension.rb b/lib/active_admin/axlsx/resource_controller_extension.rb index cce7cd5..c9e4349 100644 --- a/lib/active_admin/axlsx/resource_controller_extension.rb +++ b/lib/active_admin/axlsx/resource_controller_extension.rb @@ -1,16 +1,16 @@ module ActiveAdmin module Axlsx module ResourceControllerExtension - require "active_support" def self.included(base) # base.send :alias_method_chain, :per_page, :xlsx # base.send :alias_method_chain, :index, :xlsx + base.preprend(ResourceControllerExtension) base.send :respond_to, :xlsx end # patching the index method to allow the xlsx format. - def index_with_xlsx(&block) + def index(&block) index_without_xlsx do |format| format.xlsx do xlsx = active_admin_config.xlsx_builder.serialize(collection) @@ -20,7 +20,7 @@ def index_with_xlsx(&block) end # patching per_page to use the CSV record max for pagination when the format is xlsx - def per_page_with_xlsx + def per_page max_csv_records = 2000 if request.format == Mime::Type.lookup_by_extension(:xlsx) return max_csv_records