parent
e40f1a570e
commit
c39e0bf3db
|
@ -74,6 +74,10 @@ class Mailer < ActionMailer::Base
|
|||
@project_name = "#{project.name}"
|
||||
@user = user
|
||||
@project = project
|
||||
inviter_lists = InviteList.where(project_id:@project.id, user_id:@user.id).all
|
||||
if inviter_lists.blank?
|
||||
InviteList.create(:user_id => user.id, :project_id => project.id)
|
||||
end
|
||||
@token = Token.get_token_from_user(user, 'autologin')
|
||||
@project_url = url_for(:controller => 'projects', :action => 'member', :id => project.id, :user_id => user.id, :mail => true, :token => @token.value)
|
||||
mail :to => email, :subject => @subject
|
||||
|
|
|
@ -76,13 +76,24 @@
|
|||
<a href="#" class="btn_free" onclick="senderEmail($(this));">
|
||||
<%= l(:label_send_email)%>
|
||||
</a>
|
||||
|
||||
<% end %>
|
||||
<%# 邀请用户的状态 %>
|
||||
<% unless @inviter_lists.blank? %>
|
||||
<div>
|
||||
<span class="status_inviter">已邀请的用户</span><br/>
|
||||
<% @inviter_lists.each do |inviter_list| %>
|
||||
<%= inviter_list.user.name %><br/>
|
||||
<% end %>
|
||||
</br>
|
||||
<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 %>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div><% @inviter_lists.each do |inviter_list| %>
|
||||
<%= inviter_list.user.name %>
|
||||
<% end
|
||||
%></div>
|
||||
|
||||
|
|
|
@ -49,6 +49,7 @@ a.icon_removem{ background:url(../images/img_floatbox.png) -22px -33px no-repea
|
|||
a:hover.icon_removem{background:url(../images/img_floatbox.png) -22px -61px no-repeat;}
|
||||
a.btn_free{ background:#ff5722; display:block; text-align:center; color:#fff; padding:3px 0; width:80px; margin-bottom:10px;}
|
||||
a:hover.btn_free{ background:#d63502;}
|
||||
.status_inviter{color: #3CA5C6;font-weight: bold; font-size: 14px }
|
||||
/*成员邀请*/
|
||||
.invi_search{ }
|
||||
.invi_search_input{ border:1px solid #15bccf; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;}
|
||||
|
|
Loading…
Reference in New Issue