IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-11 05:25:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

FIX: show accurate error message based on invite token validity

Browse Source
This commit is contained in:
Arpit Jalan
2019-01-03 07:46:05 +05:30
parent a953b71797
commit bea7a8a4d1
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/invites_controller.rb
+13 -8
View File
@@ -19,16 +19,21 @@ class InvitesController < ApplicationController
invite = Invite.find_by(invite_key: params[:id])
if invite.present? && !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))
)
if invite.present?
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))
)
render layout: 'application'
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
else
flash.now[:error] = I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url)
flash.now[:error] = I18n.t('invite.not_found')
render layout: 'no_ember'
end
end