alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed member view bug in member list page for imported members without user account

This commit is contained in:
Harry Bomrah 2014-09-30 13:27:37 +08:00
parent a73098dc8f
commit 9288d66660
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/admin/members/_member_for_listing.html.erb
View File

@ -1,4 +1,5 @@
<% if member_for_listing.present? && (member_for_listing.user.approved rescue false) %> <% if member_for_listing.present? && (!member_for_listing.user.present? || member_for_listing.user.approved) %>
<% <%
if member_for_listing.sex == 'male' if member_for_listing.sex == 'male'
@member_gender = 'gender-man' @member_gender = 'gender-man'

4
app/views/admin/members/_member_for_summary.html.erb
View File

@ -1,4 +1,4 @@
<% if member_for_summary.present? && (member_for_summary.user.approved rescue false) %> <% if member_for_summary.present? && (!member_for_summary.user.present? || member_for_summary.user.approved) %>
<li id="<%= dom_id member_for_summary %>"> <li id="<%= dom_id member_for_summary %>">
<div class="member-avatar"> <div class="member-avatar">
<% <%
@ -14,7 +14,7 @@
<div class="action"> <div class="action">
<%= link_to(content_tag(:i, nil, :class => 'icon-edit'),edit_admin_member_path(member_for_summary),:class=>"edit" ) if current_user.is_admin?%> <%= link_to(content_tag(:i, nil, :class => 'icon-edit'),edit_admin_member_path(member_for_summary),:class=>"edit" ) if current_user.is_admin?%>
<%= link_to(content_tag(:i, nil, :class => 'icon-key'),admin_member_edit_privilege_path(member_for_summary),:class=>"key" ) if current_user.is_admin? and (current_user.id != member_for_summary.user.id if member_for_summary.user.present?) %> <%= link_to(content_tag(:i, nil, :class => 'icon-key'),admin_member_edit_privilege_path(member_for_summary),:class=>"key" ) if current_user.is_admin? and (current_user.id != member_for_summary.user.id if member_for_summary.user.present?) %>
<%= link_to(content_tag(:i, nil, :class => 'icon-trash'),admin_member_path(member_for_summary, at: params[:at]), data: { confirm: t('sure?') }, method: :delete, class: "trash", remote: true) if current_user.is_admin? %> <%= link_to(content_tag(:i, nil, :class => 'icon-trash'),admin_member_path(member_for_summary.id, at: params[:at]), data: { confirm: t('sure?') }, method: :delete, class: "trash", remote: true) if current_user.is_admin? %>
</div> </div>
<%= image_tag(member_for_summary.avatar) %> <%= image_tag(member_for_summary.avatar) %>
</div> </div>

4
app/views/admin/members/_member_for_thumbnail.html.erb
View File

@ -1,4 +1,4 @@
<% if member_for_thumbnail.present? && (member_for_thumbnail.user.approved rescue false) %> <% if member_for_thumbnail.present? && (!member_for_thumbnail.user.present? || member_for_thumbnail.user.approved) %>
<% <%
if member_for_thumbnail.sex == 'male' if member_for_thumbnail.sex == 'male'
@user_sex = 'gender-man' @user_sex = 'gender-man'
@ -14,7 +14,7 @@
<%= link_to(content_tag(:i, nil, :class => 'icon-edit'),edit_admin_member_path(member_for_thumbnail),:class=>"edit" ) if current_user.is_admin?%> <%= link_to(content_tag(:i, nil, :class => 'icon-edit'),edit_admin_member_path(member_for_thumbnail),:class=>"edit" ) if current_user.is_admin?%>
<%= link_to(content_tag(:i, nil, :class => 'icon-key'),admin_member_edit_privilege_path(member_for_thumbnail),:class=>"key" ) if current_user.is_admin? and (current_user.id != member_for_thumbnail.user.id if member_for_thumbnail.user.present?) %> <%= link_to(content_tag(:i, nil, :class => 'icon-key'),admin_member_edit_privilege_path(member_for_thumbnail),:class=>"key" ) if current_user.is_admin? and (current_user.id != member_for_thumbnail.user.id if member_for_thumbnail.user.present?) %>
<%= link_to(content_tag(:i, nil, :class => 'icon-trash'),admin_member_path(member_for_thumbnail, at: params[:at]), data: { confirm: t('sure?') }, method: :delete, class: "trash", remote: true) if current_user.is_admin? %> <%= link_to(content_tag(:i, nil, :class => 'icon-trash'),admin_member_path(member_for_thumbnail.id, at: params[:at]), data: { confirm: t('sure?') }, method: :delete, class: "trash", remote: true) if current_user.is_admin? %>
</div> </div>
<%= image_tag(member_for_thumbnail.avatar) %> <%= image_tag(member_for_thumbnail.avatar) %>
</div> </div>