|
|
@ -357,6 +357,7 @@ class ProjectsController < ApplicationController
|
|
|
|
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# 项目邀请用户加入实现过程
|
|
|
|
# 两种情况:1、系统外用户;2、系统内用户 (通过邮件判定)
|
|
|
|
# 两种情况:1、系统外用户;2、系统内用户 (通过邮件判定)
|
|
|
|
def send_mail_to_member
|
|
|
|
def send_mail_to_member
|
|
|
|
# 该邮箱未注册过
|
|
|
|
# 该邮箱未注册过
|
|
|
@ -393,7 +394,7 @@ class ProjectsController < ApplicationController
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
#发送邮件邀请新用户
|
|
|
|
# 发送邮件邀请新用户页面对应方法
|
|
|
|
def invite_members_by_mail
|
|
|
|
def invite_members_by_mail
|
|
|
|
if User.current.member_of?(@project) || User.current.admin?
|
|
|
|
if User.current.member_of?(@project) || User.current.admin?
|
|
|
|
@inviter_lists = InviteList.where(project_id:@project.id).all
|
|
|
|
@inviter_lists = InviteList.where(project_id:@project.id).all
|
|
|
@ -461,9 +462,9 @@ class ProjectsController < ApplicationController
|
|
|
|
flash[:notice] = l(:label_mail_invite_success)
|
|
|
|
flash[:notice] = l(:label_mail_invite_success)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
# 私有项目非项目成员无法访问成员列表
|
|
|
|
unless @project.is_public?
|
|
|
|
unless @project.is_public?
|
|
|
|
return render_403 unless User.current.member_of?(@project)
|
|
|
|
return render_403 unless User.current.member_of?(@project)
|
|
|
|
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
## 有角色参数的才是课程,没有的就是项目
|
|
|
|
## 有角色参数的才是课程,没有的就是项目
|
|
|
|
@render_file = 'project_member_list'
|
|
|
|
@render_file = 'project_member_list'
|
|
|
|