From 7e89cd27aacfd30390788a4f3faf589c16a97d9e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 6 Jun 2015 10:22:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=82=80=E8=AF=B7bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb           | 16 +++++++++-------
 .../mailer/send_for_user_activities.html.erb     |  1 -
 .../projects/invite_members_by_mail.html.erb     |  6 ++++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 1793eb39c..70efa47fa 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -367,13 +367,15 @@ class ProjectsController < ApplicationController
       @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
+          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
+            end
           end
         end
       end
diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 3d53acd5a..9723783fe 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -138,7 +138,6 @@
               <%= l(:label_course_attendingcontestwork_download) %>
               <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @attachments.count %>)</span>
             </h4>
-
             <% @attachments.each do |attachment|%>
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index 7b3a4c552..349bc2b56 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -90,8 +90,10 @@
       <% unless @waiters_count.nil? %>
         <span class="status_inviter">等待加入项目的用户</span><br/>
         <% @inviter_lists.each do |inviter_list| %>
-          <% unless inviter_list.user.member_of?(@project) %>
-            <%= inviter_list.user.name unless inviter_list.user.nil? %><br/>
+          <% unless inviter_list.user.nil? %>
+            <% unless inviter_list.user.member_of?(@project) %>
+                <%= inviter_list.user.name %><br/>
+            <% end %>
           <% end %>
         <% end %>
       <% end %>