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) %> (<%= @attachments.count %>) - <% @attachments.each do |attachment|%>
  • 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? %> 等待加入项目的用户
    <% @inviter_lists.each do |inviter_list| %> - <% unless inviter_list.user.member_of?(@project) %> - <%= inviter_list.user.name unless inviter_list.user.nil? %>
    + <% unless inviter_list.user.nil? %> + <% unless inviter_list.user.member_of?(@project) %> + <%= inviter_list.user.name %>
    + <% end %> <% end %> <% end %> <% end %>