Merge pull request #1 from mfairburn/issue#36

Fix upstream issue randym#36
mfairburn · Mar 18, 2015 · 01a8503 · 01a8503
2 parents 4c2ae1f + 53b560e
commit 01a8503
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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', "~> 0.6.0"
+  s.add_runtime_dependency 'activeadmin', "> 0.6.0"
   s.add_runtime_dependency 'axlsx'
 
   s.required_ruby_version = '>= 1.9.2'

diff --git a/lib/active_admin/axlsx/resource_controller_extension.rb b/lib/active_admin/axlsx/resource_controller_extension.rb
@@ -19,6 +19,7 @@ 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
+          max_csv_records = 9999
           if request.format ==  Mime::Type.lookup_by_extension(:xlsx)
             return max_csv_records
           end