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

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

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>

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 %>