chiu
/
impressionist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #213 from yarikov/master 

Rails 5: wrong number of arguments (given 2, expected 0..1)
This commit is contained in:
John McAliley 2016-09-16 09:22:11 -04:00 committed by GitHub
parent 6e551927ec a0fddc9072
commit 03379bf003
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/impressionist/impressionable.rb
View File

@ -41,7 +41,7 @@ module Impressionist
# Count all distinct impressions unless the :all filter is provided. # Count all distinct impressions unless the :all filter is provided.
distinct = options[:filter] != :all distinct = options[:filter] != :all
if Rails::VERSION::MAJOR == 4 if Rails::VERSION::MAJOR >= 4
distinct ? imps.select(options[:filter]).distinct.count : imps.count distinct ? imps.select(options[:filter]).distinct.count : imps.count
else else
distinct ? imps.count(options[:filter], :distinct => true) : imps.count distinct ? imps.count(options[:filter], :distinct => true) : imps.count