Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

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|

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
   # 根据用户选择发送个人日报或周报
   # 发送内容： 项目【缺陷，讨论区，新闻】，课程【通知，留言，新闻】， 贴吧， 个人留言