Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Resend only pending invites (#13403) 

The Resend Invites button used to resend expired invites too, which was
unexpected because the button was on the Pending Invites page.
This commit is contained in:
Dan Ungureanu 2021-06-17 10:45:53 +03:00 committed by GitHub
parent c893b20298
commit 007e166d13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/invites_controller.rb
View File

@ -290,12 +290,8 @@ class InvitesController < ApplicationController
def resend_all_invites def resend_all_invites
guardian.ensure_can_resend_all_invites!(current_user) guardian.ensure_can_resend_all_invites!(current_user)
Invite Invite.pending(current_user)
.left_outer_joins(:invited_users)
.where(invited_by: current_user)
.where('invites.email IS NOT NULL') .where('invites.email IS NOT NULL')
.where('invited_users.user_id IS NULL')
.group('invites.id')
.find_each { |invite| invite.resend_invite } .find_each { |invite| invite.resend_invite }
render json: success_json render json: success_json

8
spec/requests/invites_controller_spec.rb
View File

@ -744,6 +744,8 @@ describe InvitesController do
it 'resends all non-redeemed invites by a user' do it 'resends all non-redeemed invites by a user' do
SiteSetting.invite_expiry_days = 30 SiteSetting.invite_expiry_days = 30
freeze_time
user = Fabricate(:admin) user = Fabricate(:admin)
new_invite = Fabricate(:invite, invited_by: user) new_invite = Fabricate(:invite, invited_by: user)
expired_invite = Fabricate(:invite, invited_by: user) expired_invite = Fabricate(:invite, invited_by: user)
@ -756,9 +758,9 @@ describe InvitesController do
post '/invites/reinvite-all' post '/invites/reinvite-all'
expect(response.status).to eq(200) expect(response.status).to eq(200)
expect(new_invite.reload.expires_at.to_date).to eq(30.days.from_now.to_date) expect(new_invite.reload.expires_at).to eq_time(30.days.from_now)
expect(expired_invite.reload.expires_at.to_date).to eq(30.days.from_now.to_date) expect(expired_invite.reload.expires_at).to eq_time(2.days.ago)
expect(redeemed_invite.reload.expires_at.to_date).to eq(5.days.ago.to_date) expect(redeemed_invite.reload.expires_at).to eq_time(5.days.ago)
end end
end end