github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 06:04:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: counting invites didn't work

Browse Source 
PostgreSQL reported the following error:
"for SELECT DISTINCT, ORDER BY expressions must appear in select list"
This commit is contained in:
Gerhard Schlager 2017-11-14 11:38:54 +01:00
parent ba2209f7d7
commit 4be8f17e66
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/invite.rb
View File

@ -183,11 +183,11 @@ class Invite < ActiveRecord::Base
end
def self.find_pending_invites_count(inviter)
find_all_invites_from(inviter, 0, nil).where('invites.user_id IS NULL').count
find_all_invites_from(inviter, 0, nil).where('invites.user_id IS NULL').reorder(nil).count
end
def self.find_redeemed_invites_count(inviter)
find_all_invites_from(inviter, 0, nil).where('invites.user_id IS NOT NULL').count
find_all_invites_from(inviter, 0, nil).where('invites.user_id IS NOT NULL').reorder(nil).count
end
def self.filter_by(email_or_username)

4
spec/models/invite_spec.rb
View File

@ -402,6 +402,8 @@ describe Invite do
expect(invites.length).to eq(1)
expect(invites.first).to eq pending_invite
expect(Invite.find_pending_invites_count(inviter)).to eq(1)
end
end
@ -426,6 +428,8 @@ describe Invite do
expect(invites.length).to eq(1)
expect(invites.first).to eq redeemed_invite
expect(Invite.find_redeemed_invites_count(inviter)).to eq(1)
end
end