|
|
|
@ -248,8 +248,20 @@ class ProjectsController < ApplicationController
|
|
|
|
|
# 2、加入项目、创建角色
|
|
|
|
|
# 3、用户得分
|
|
|
|
|
if params[:mail]
|
|
|
|
|
Member.create(:role_ids => [4], :user_id => params[:user],:project_id => params[:id])
|
|
|
|
|
UserGrade.create(:user_id =>params[:user], :project_id => params[:id])
|
|
|
|
|
user = User.find(params[:user_id])
|
|
|
|
|
user.activate!
|
|
|
|
|
Member.create(:role_ids => [4], :user_id => params[:user_id],:project_id => params[:id])
|
|
|
|
|
UserGrade.create(:user_id => params[:user_id], :project_id => params[:id])
|
|
|
|
|
token = Token.get_token_from_user(user, 'autologin')
|
|
|
|
|
#user = User.try_to_autologin(token.value)
|
|
|
|
|
if user
|
|
|
|
|
start_user_session(user)
|
|
|
|
|
user.save
|
|
|
|
|
redirect_to project_member_path(params[:id])
|
|
|
|
|
return
|
|
|
|
|
# account_ project_member_path(params[:id])
|
|
|
|
|
flash[:notice] = l(:label_mail_invite_success)
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
|
|
|
|
|
return
|
|
|
|
|