IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: better error message if invite is expired (#10783)

Browse Source 
https://meta.discourse.org/t/invite-token-is-invalid/165270/5?u=techapj
This commit is contained in:
Arpit Jalan
2020-09-30 20:32:33 +05:30
committed by GitHub
parent a13497dd1f
commit ff44515a18
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/controllers/invites_controller.rb
View File

@@ -18,23 +18,23 @@ class InvitesController < ApplicationController
expires_now
invite = Invite.find_by(invite_key: params[:id])
if invite.present? && !invite.expired? && !invite.redeemed?
store_preloaded("invite_info", MultiJson.dump(
invited_by: UserNameSerializer.new(invite.invited_by, scope: guardian, root: false),
email: invite.email,
username: UserNameSuggester.suggest(invite.email),
is_invite_link: invite.is_invite_link?)
)
if invite.present? && !invite.expired?
if !invite.redeemed?
store_preloaded("invite_info", MultiJson.dump(
invited_by: UserNameSerializer.new(invite.invited_by, scope: guardian, root: false),
email: invite.email,
username: UserNameSuggester.suggest(invite.email),
is_invite_link: invite.is_invite_link?)
)
render layout: 'application'
else
flash.now[:error] = I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url)
render layout: 'no_ember'
end
render layout: 'application'
else
flash.now[:error] = I18n.t('invite.not_found', base_url: Discourse.base_url)
flash.now[:error] = if invite.present? && invite.expired?
I18n.t('invite.expired', base_url: Discourse.base_url)
elsif invite.present? && invite.redeemed?
I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url)
else
I18n.t('invite.not_found', base_url: Discourse.base_url)
end
render layout: 'no_ember'
end
end