Merge pull request jbox-web#31 from mitchej123/fix-count-on-rails-4-1

antillas21 · antillas21 · commit c9d040a9b5d5 · 2014-07-31T14:36:41.000-07:00
Fix count method to work with select statement for Rails 4.1
diff --git a/lib/ajax-datatables-rails/base.rb b/lib/ajax-datatables-rails/base.rb
@@ -36,8 +36,8 @@ def get_raw_records
     def as_json(options = {})
       {
         :draw => params[:draw].to_i,
-        :recordsTotal =>  get_raw_records.count,
-        :recordsFiltered => filter_records(get_raw_records).count,
+        :recordsTotal =>  get_raw_records.count(:all),
+        :recordsFiltered => filter_records(get_raw_records).count(:all),
         :data => data
       }
     end

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ def get_raw_records`
`36`	`36`	`def as_json(options = {})`
`37`	`37`	`{`
`38`	`38`	`:draw => params[:draw].to_i,`
`39`		`- :recordsTotal => get_raw_records.count,`
`40`		`- :recordsFiltered => filter_records(get_raw_records).count,`
	`39`	`+ :recordsTotal => get_raw_records.count(:all),`
	`40`	`+ :recordsFiltered => filter_records(get_raw_records).count(:all),`
`41`	`41`	`:data => data`
`42`	`42`	`}`
`43`	`43`	`end`