github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-03 02:48:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2542 from techAPJ/patch-1

Browse Source 
FEATURE: topic support in disposable invites
This commit is contained in:
Robin Ward
2014-07-15 15:15:19 -04:00
parent c037371be1 8862a881f8
commit 6d7531f690
3 changed files with 54 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/invite.rb
View File

@ -168,10 +168,11 @@ class Invite < ActiveRecord::Base
invite
end
def self.redeem_from_token(token, email, username=nil, name=nil)
def self.redeem_from_token(token, email, username=nil, name=nil, topic_id=nil)
invite = Invite.find_by(invite_key: token)
if invite
invite.update_column(:email, email)
invite.topic_invites.create!(invite_id: invite.id, topic_id: topic_id) if topic_id && Topic.find_by_id(topic_id)
user = InviteRedeemer.new(invite, username, name).redeem
end
user