diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 3c34aa549..1793eb39c 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -365,6 +365,18 @@ 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 + 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 + end + end + end @is_zhuce = false respond_to do |format| format.html diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb index ce7ea2aa1..bb98b3356 100644 --- a/app/views/projects/invite_members_by_mail.html.erb +++ b/app/views/projects/invite_members_by_mail.html.erb @@ -79,19 +79,23 @@ <% end %> <%# 邀请用户的状态 %> <% unless @inviter_lists.blank? %> -
+
+ <% if @inviters_count > 0 %> 已邀请的用户
<% @inviter_lists.each do |inviter_list| %> - <%= inviter_list.user.name %>
+ <%= inviter_list.user.name unless inviter_list.user.nil? %>
<% end %> -
+ <% end %> +
+ <% unless @waiters_count == 0 %> 等待加入项目的用户
<% @inviter_lists.each do |inviter_list| %> - <% unless inviter_list.user.member_of?(@project) %> - <%= inviter_list.user.name %>
- <% end %> + <% unless inviter_list.user.member_of?(@project) %> + <%= inviter_list.user.name unless inviter_list.user.nil? %>
+ <% end %> <% end %> -
+ <% end %> +
<% end %>