From a967a86a1dbf8794287f13caccadfee9d63f950b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 5 Jun 2015 14:24:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6500?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb         | 12 ++++++++++++
 .../projects/invite_members_by_mail.html.erb   | 18 +++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 3c34aa549..1793eb39c 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -365,6 +365,18 @@ class ProjectsController < ApplicationController
   def invite_members_by_mail
     if User.current.member_of?(@project) || User.current.admin?
       @inviter_lists = InviteList.where(project_id:@project.id).all
+      unless @inviter_lists.blank?
+        @inviter_lists.each do|inviter_list|
+          @inviters = []
+          @waiters = []
+          @inviters << inviter_list.user
+          @inviters_count = @inviters.size
+          unless inviter_list.user.member_of?(@project)
+            @waiters << inviter_list.user
+            @waiters_count = @waiters.size
+          end
+        end
+      end
       @is_zhuce = false
       respond_to do |format|
         format.html
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index ce7ea2aa1..bb98b3356 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -79,19 +79,23 @@
   <% end %>
   <%# 邀请用户的状态 %>
   <% unless @inviter_lists.blank? %>
-      <div>
+    <div>
+      <% if @inviters_count > 0 %>
         <span class="status_inviter">已邀请的用户</span><br/>
         <% @inviter_lists.each do |inviter_list| %>
-            <%= inviter_list.user.name %><br/>
+            <%= inviter_list.user.name unless inviter_list.user.nil? %><br/>
         <% end %>
-        </br>
+      <% end %>
+      </br>
+      <% unless @waiters_count == 0 %>
         <span class="status_inviter">等待加入项目的用户</span><br/>
         <% @inviter_lists.each do |inviter_list| %>
-            <% unless inviter_list.user.member_of?(@project) %>
-                <%= inviter_list.user.name %><br/>
-            <% end %>
+          <% unless inviter_list.user.member_of?(@project) %>
+            <%= inviter_list.user.name unless inviter_list.user.nil? %><br/>
+          <% end %>
         <% end %>
-      </div>
+      <% end %>
+    </div>
   <% end %>
 </div>