From 543ae1bbd027e122e428812682d15075398605fe Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 6 Jun 2015 11:39:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=80=E8=AF=B7=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E9=A1=B9=E7=9B=AE=E9=80=BB=E8=BE=91=EF=BC=9A=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E5=B7=B2=E5=8A=A0=E5=85=A5=E5=92=8C=E7=AD=89=E5=BE=85?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb           | 15 ++++++++-------
 .../projects/invite_members_by_mail.html.erb     | 16 ++++++----------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 70efa47fa..efe5a52ee 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -365,16 +365,17 @@ 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
+      @inviters = []
+      @waiters = []
       unless @inviter_lists.blank?
         @inviter_lists.each do|inviter_list|
-          inviters = []
-          waiters = []
-          inviters << inviter_list.user
-          @inviters_count = inviters.size
           unless inviter_list.user.nil?
-            unless inviter_list.user.member_of?(@project)
-              waiters << inviter_list.user
-              @waiters_count = waiters.size
+            if inviter_list.user.member_of?(@project)
+              @inviters << inviter_list.user
+              @inviters_count = @inviters.size
+            else
+              @waiters << inviter_list.user
+              @waiters_count = @waiters.size
             end
           end
         end
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index 349bc2b56..4c6ee47d8 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -80,21 +80,17 @@
   <%# 邀请用户的状态 %>
   <% unless @inviter_lists.blank? %>
     <div>
-      <% if @inviters_count > 0 %>
-        <span class="status_inviter">已邀请的用户</span><br/>
-        <% @inviter_lists.each do |inviter_list| %>
-            <%= inviter_list.user.name unless inviter_list.user.nil? %><br/>
+      <% unless @inviters_count.nil? %>
+        <span class="status_inviter">已加入项目的用户</span><br/>
+        <% @inviters.each do |inv| %>
+            <%= inv.name unless inv.nil? %><br/>
         <% end %>
       <% end %>
       </br>
       <% unless @waiters_count.nil? %>
         <span class="status_inviter">等待加入项目的用户</span><br/>
-        <% @inviter_lists.each do |inviter_list| %>
-          <% unless inviter_list.user.nil? %>
-            <% unless inviter_list.user.member_of?(@project) %>
-                <%= inviter_list.user.name %><br/>
-            <% end %>
-          <% end %>
+        <% @waiters.each do |wai| %>
+          <%= wai.name unless wai.nil?%><br/>
         <% end %>
       <% end %>
     </div>