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? %>
- <% if @inviters_count > 0 %> - 已邀请的用户
- <% @inviter_lists.each do |inviter_list| %> - <%= inviter_list.user.name unless inviter_list.user.nil? %>
+ <% unless @inviters_count.nil? %> + 已加入项目的用户
+ <% @inviters.each do |inv| %> + <%= inv.name unless inv.nil? %>
<% end %> <% end %>
<% unless @waiters_count.nil? %> 等待加入项目的用户
- <% @inviter_lists.each do |inviter_list| %> - <% unless inviter_list.user.nil? %> - <% unless inviter_list.user.member_of?(@project) %> - <%= inviter_list.user.name %>
- <% end %> - <% end %> + <% @waiters.each do |wai| %> + <%= wai.name unless wai.nil?%>
<% end %> <% end %>