|
|
|
@ -33,7 +33,7 @@ class Mailer < ActionMailer::Base
|
|
|
|
|
@target = cls
|
|
|
|
|
end
|
|
|
|
|
def method_missing(name, *args, &block)
|
|
|
|
|
if Setting.delayjob_enabled && Object.const_defined?('Delayed')
|
|
|
|
|
if Setting.delayjob_enabled? && Object.const_defined?('Delayed')
|
|
|
|
|
@target.delay.send(name, *args, &block)
|
|
|
|
|
else
|
|
|
|
|
@target.send(name, *args, &block).deliver
|
|
|
|
@ -52,9 +52,20 @@ class Mailer < ActionMailer::Base
|
|
|
|
|
@email = email
|
|
|
|
|
@subject = "#{invitor.name} #{l(:label_invite_project)} #{project.name} "
|
|
|
|
|
@password = newpass(6)
|
|
|
|
|
@project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id,
|
|
|
|
|
:password => @password,
|
|
|
|
|
:login => email)
|
|
|
|
|
|
|
|
|
|
login = email
|
|
|
|
|
login = login.sub(/%40/,'@')
|
|
|
|
|
us = UsersService.new
|
|
|
|
|
# 自动激活用户
|
|
|
|
|
user = us.register_auto(login, @email, @password)
|
|
|
|
|
|
|
|
|
|
Member.create(:role_ids => [4], :user_id => user.id,:project_id => project.id)
|
|
|
|
|
UserGrade.create(:user_id => user.id, :project_id => project.id)
|
|
|
|
|
User.current = user unless User.current.nil?
|
|
|
|
|
@user = user
|
|
|
|
|
@token = Token.get_token_from_user(user, 'autologin')
|
|
|
|
|
@project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id,:user => user, :token => @token.value
|
|
|
|
|
)
|
|
|
|
|
mail :to => email, :subject => @subject
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|