diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index f83580fba..4f84212b4 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -334,8 +334,7 @@ class ProjectsController < ApplicationController end def send_mail_to_member - - if !params[:mail].nil? && User.find_by_mail(params[:mail].to_s).nil? + if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil? email = params[:mail] Mailer.send_invite_in_project(email, @project, User.current).deliver @is_zhuce =false diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb index 70628094b..e0ba05f18 100644 --- a/app/views/projects/invite_members_by_mail.html.erb +++ b/app/views/projects/invite_members_by_mail.html.erb @@ -1,3 +1,12 @@ +

邀请加入

@@ -9,7 +18,7 @@

发送邮件邀请新用户

- 输入好友邮箱地址,Trustie帮您免费发送! + 输入好友邮箱地址,Trustie会自动为该邮箱注册用户!

<%= render :partial => 'regested', locals: { :isregisted => false} %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 76f14f0da..9ed58788d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -181,7 +181,7 @@ zh: notice_successful_create: 创建成功 notice_successful_update: 更新成功 notice_successful_delete: 删除成功 - notice_registed_success: 该邮箱已被注册,请直接邀请注册用户 + notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册! notice_failed_delete: 删除失败 notice_successful_connection: 连接成功 notice_successful_join: 加入成功