From cfea5e9c8951006220c1f7288f0cd777a4283c97 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 18 Sep 2015 15:25:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=80=E8=AF=B7=E5=B7=B2=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=20=E6=B6=88=E6=81=AF=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 3 +-- app/models/mailer.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index de1aeadd3..6da45c10b 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -396,7 +396,7 @@ class ProjectsController < ApplicationController Mailer.request_member_to_project(email, @project, User.current).deliver flash[:notice] = l(:notice_email_sent, :value => email) else - # 已经发送过了，则隔24小时才能再次发送 + # 已经发送过了，则隔3小时才能再次发送 if Time.now - invite_list.created_at > 10800 email = params[:mail] Mailer.request_member_to_project(email, @project, User.current).deliver @@ -409,7 +409,6 @@ class ProjectsController < ApplicationController flash[:error] = l(:label_member_of_project, :value => email) end else - flash[:error] = l(:notice_registed_error, :value => email) @is_zhuce = true end respond_to do |format| diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 2b343e9ac..c9ab6e58e 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -81,9 +81,17 @@ class Mailer < ActionMailer::Base end @token = Token.get_token_from_user(user, 'autologin') @project_url = url_for(:controller => 'projects', :action => 'member', :id => project.id, :user_id => user.id, :mail => true, :token => @token.value) + # 发送消息邀请 + send_message(user,project) + # end mail :to => email, :subject => @subject end + # 邀请信息消息 注：forge_message_id 为邀请人ID(特殊情况) + def send_message(user, project) + ForgeMessage.create(:user_id => user.id, :project_id => project.id, :forge_message_type => "Project_Invite",:forge_message_id => User.current.id, :viewed => false) + end + # author: alan # 根据用户选择发送个人日报或周报 # 发送内容： 项目【缺陷，讨论区，新闻】，课程【通知，留言，新闻】， 贴吧， 个人留言