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

Conflicts:
	public/stylesheets/project.css

app/controllers/projects_controller.rb

@@ -247,10 +247,9 @@ class ProjectsController < ApplicationController
     # 1、自动注册
     # 2、加入项目、创建角色
     # 3、用户得分
-    if params[:login]
-      # 自动激活用户
-      user.status = 1
-      user.save
+    if params[:email]
+      user = User.find_by_mail(params[:email].to_s)
+      Member.create(:role_ids => [4], :user_id => user.id,:project_id => @project.id)
     end
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
@@ -344,12 +343,22 @@ class ProjectsController < ApplicationController
 
   end
 
+  # 两种情况：1、系统外用户；2、系统内用户 (通过邮件判定)
   def send_mail_to_member
     if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil?
       email = params[:mail]
       Mailer.run.send_invite_in_project(email, @project, User.current)
       @is_zhuce =false
       flash[:notice] = l(:notice_email_sent, :value => email)
+    elsif !User.find_by_mail(params[:mail].to_s).nil?
+      user = User.find_by_mail(params[:mail].to_s)
+      if !user.member_of?(@project)
+        email = params[:mail]
+        Mailer.run.request_member_to_project(email, @project, User.current)
+        flash[:notice] = l(:notice_email_sent, :value => email)
+      else
+        flash[:error] = l(:label_member_of_project, :value => email)
+      end
     else
       flash[:error] = l(:notice_registed_error, :value => email)
       @is_zhuce = true
@@ -358,6 +367,7 @@ class ProjectsController < ApplicationController
       format.html{redirect_to invite_members_by_mail_project_url(@project)}
     end
   end
+
   #发送邮件邀请新用户
   def invite_members_by_mail
     if User.current.member_of?(@project) || User.current.admin? 

app/models/mailer.rb

@@ -69,6 +69,18 @@ class Mailer < ActionMailer::Base
     mail :to => email, :subject => @subject
   end
 
+  # 邀请已注册的用户加入项目
+  def request_member_to_project(email, project, invitor)
+    @subject = "#{invitor.name} #{l(:label_invite_project)}: #{project.name} "
+    user = User.find_by_mail(email.to_s)
+    @invitor_name = "#{invitor.name}"
+    @project_name = "#{project.name}"
+    @user = user
+    @token = Token.get_token_from_user(user, 'autologin')
+    @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id, :email => email, :token => @token.value)
+    mail :to => email, :subject => @subject
+  end
+
   # author: alan
   # 根据用户选择发送个人日报或周报
   # 发送内容： 项目【缺陷，讨论区，新闻】，课程【通知，留言，新闻】， 贴吧， 个人留言
@@ -154,7 +166,7 @@ class Mailer < ActionMailer::Base
                    @course_journal_messages,@user_journal_messages,@forums,@memos,@attachments,@bids].any? {|o|
                     !o.empty?
                   }
-    binding.pry if Rails.env.development?
+    mylogger.debug "Sent activity mail : #{user.mail} - #{has_content}"
     #有内容才发，没有不发
     mail :to => user.mail,:subject => subject if has_content
   end
@@ -829,11 +841,12 @@ class Mailer < ActionMailer::Base
     end
 
     set_language_if_valid @initial_language
-    super headers do |format|
+    m = super headers do |format|
       format.text
       format.html unless Setting.plain_text_mail?
     end
-
+    mylogger.debug "Sent a mail from #{m.from} to [#{m.to},#{m.cc}, #{m.bcc if Setting.bcc_recipients?}] subject: #{m.subject}"
+    m
   end
 
   def initialize(*args)
@@ -888,7 +901,11 @@ class Mailer < ActionMailer::Base
   end
 
   def mylogger
-    Rails.logger
+    if Setting.delayjob_enabled? 
+      Delayed::Worker.logger
+    else
+      Rails.logger
+    end
   end
 
   def add_attachments(obj)

app/views/mailer/request_member_to_project.html.erb

@@ -0,0 +1,22 @@
+
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+        	<p><span style="color:#1b55a7; font-weight:bold;"><%= @invitor_name %></span> 邀请您加入项目：<span style="color:#1b55a7; font-weight:bold;"><%= @project_name %></span> </p>
+          <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+          <p>点击“同意加入”按钮，即可快速加入项目！</p> <br/>
+          <label  class="mail_reply">
+            <%= link_to( l(:label_agree_join_project), @project_url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
+          </label>
+          <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+        </span>
+    </li>
+
+  </ul>
+
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>
+
+

app/views/mailer/request_member_to_project.text.erb

@@ -0,0 +1,3 @@
+<%= @invitor_name %>
+<%= @project_name %>
+<%= link_to( l(:label_apply_project), @project_url) %>

config/locales/projects/zh.yml

@@ -48,11 +48,13 @@ zh:
   #  左边栏
   #           
   label_project_id: "项目ID:"
-    
+
+  label_agree_join_project: 同意加入
   label_apply_project: "+申请加入"
   label_button_following: "+添加关注"
   label_exit_project: 退出项目
   label_apply_project_waiting: 已处理申请，请等待管理员审核
+  label_member_of_project: 该用户已经是项目成员了！
   label_unapply_project: 取消申请
   lable_sure_exit_project: 是否确认退出该项目
   label_friend_organization: 圈子模式

public/stylesheets/project.css

@@ -338,6 +338,7 @@ a:hover.st_add{ color:#ff8e15;}
 .newpro_box input{  height:26px; float:left; margin-bottom:10px;}
 .newpro_box textarea{  height:150px; float:left; margin-bottom:10px;}
 .newpro_box select{ height:29px; float:left; margin-bottom:10px;}
+/*.label{ width:80px; text-align:right; font-size:14 background-image: url(../images/true.png); }*/
 .icon-reload  { background-image: url(../images/reload.png); }
 .icon {
     background-position: 0% 50%;