|
|
|
@ -413,10 +413,11 @@ class ProjectsController < ApplicationController
|
|
|
|
|
# 2、加入项目、创建角色
|
|
|
|
|
# 3、用户得分
|
|
|
|
|
if params[:mail]
|
|
|
|
|
user = User.find(params[:user_id])
|
|
|
|
|
userid = Token.find_by_value(params[:token]).user_id
|
|
|
|
|
user = User.find(userid)
|
|
|
|
|
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])
|
|
|
|
|
Member.create(:role_ids => [4], :user_id => userid, :project_id => params[:id])
|
|
|
|
|
UserGrade.create(:user_id => userid, :project_id => params[:id])
|
|
|
|
|
token = Token.get_token_from_user(user, 'autologin')
|
|
|
|
|
#user = User.try_to_autologin(token.value)
|
|
|
|
|
if user
|
|
|
|
|