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: invited users get clearer messaging when setting a password for the first time

Browse Source
This commit is contained in:
Neil Lalonde
2014-01-21 12:42:20 -05:00
parent 3c3449aa1b
commit ba74226346
7 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/mailers/user_notifications.rb
View File

@@ -25,7 +25,9 @@ class UserNotifications < ActionMailer::Base
end
def forgot_password(user, opts={})
build_email(user.email, template: "user_notifications.forgot_password", email_token: opts[:email_token])
build_email( user.email,
template: user.has_password? ? "user_notifications.forgot_password" : "user_notifications.set_password",
email_token: opts[:email_token])
end
def digest(user, opts={})