修改邮件500缺陷
This commit is contained in:
parent
6886f0fba3
commit
a967a86a1d
|
@ -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
|
||||
|
|
|
@ -79,19 +79,23 @@
|
|||
<% end %>
|
||||
<%# 邀请用户的状态 %>
|
||||
<% unless @inviter_lists.blank? %>
|
||||
<div>
|
||||
<div>
|
||||
<% if @inviters_count > 0 %>
|
||||
<span class="status_inviter">已邀请的用户</span><br/>
|
||||
<% @inviter_lists.each do |inviter_list| %>
|
||||
<%= inviter_list.user.name %><br/>
|
||||
<%= inviter_list.user.name unless inviter_list.user.nil? %><br/>
|
||||
<% end %>
|
||||
</br>
|
||||
<% end %>
|
||||
</br>
|
||||
<% unless @waiters_count == 0 %>
|
||||
<span class="status_inviter">等待加入项目的用户</span><br/>
|
||||
<% @inviter_lists.each do |inviter_list| %>
|
||||
<% unless inviter_list.user.member_of?(@project) %>
|
||||
<%= inviter_list.user.name %><br/>
|
||||
<% end %>
|
||||
<% unless inviter_list.user.member_of?(@project) %>
|
||||
<%= inviter_list.user.name unless inviter_list.user.nil? %><br/>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
|
|
Loading…
Reference in New Issue