From b43acd3a462dc33fcb85de4bf27f34597f391911 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 16 Sep 2015 11:09:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=80=E8=AF=B7=E7=94=A8=E6=88=B7=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E9=A1=B9=E7=9B=AE=EF=BC=9A=20=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E6=83=85=E5=86=B5=EF=BC=9A=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=90=8D=3D=E9=82=AE=E7=AE=B1=E5=90=8D=EF=BC=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BF=AE=E6=94=B9=E9=82=AE=E7=AE=B1=EF=BC=8C=E6=AD=A4?= =?UTF-8?q?=E6=97=B6=E5=B0=86=E7=94=A8=E6=88=B7=E4=BD=9C=E4=B8=BA=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E9=82=80=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 2287e1968..217c47866 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -363,8 +363,20 @@ class ProjectsController < ApplicationController # 该邮箱未注册过 if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil? if !User.where("login =?", params[:mail]).first.nil? - # 用户名唯一，如果该邮箱被用户作为用户名使用则跳出 - flash[:error] = l(:notice_email_login_used) + # 用户名唯一，用户修改邮箱，未修改用户名，用户名等同邮箱的情况，默认改用户已经注册 + user = User.find_by_login(params[:mail].to_s) + if !user.member_of?(@project) + # 如果已经邀请过该用户，则不重复发送 + if InviteList.where("project_id =? and mail =?", @project.id, params[:mail].to_s).first.nil? + email = params[:mail] + Mailer.request_member_to_project(email, @project, User.current).deliver + flash[:notice] = l(:notice_email_sent, :value => email) + else + flash[:error] = l(:notice_email_invited) + end + else + flash[:error] = l(:label_member_of_project, :value => email) + end else email = params[:mail] Mailer.send_invite_in_project(email, @project, User.current).deliver