diff --git a/app/views/admin/members/_member_for_listing.html.erb b/app/views/admin/members/_member_for_listing.html.erb index 2986dbb..3c67867 100644 --- a/app/views/admin/members/_member_for_listing.html.erb +++ b/app/views/admin/members/_member_for_listing.html.erb @@ -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' @member_gender = 'gender-man' diff --git a/app/views/admin/members/_member_for_summary.html.erb b/app/views/admin/members/_member_for_summary.html.erb index bdcc135..f39a439 100644 --- a/app/views/admin/members/_member_for_summary.html.erb +++ b/app/views/admin/members/_member_for_summary.html.erb @@ -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) %>
  • <% @@ -14,7 +14,7 @@
    <%= 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-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? %>
    <%= image_tag(member_for_summary.avatar) %>
    diff --git a/app/views/admin/members/_member_for_thumbnail.html.erb b/app/views/admin/members/_member_for_thumbnail.html.erb index bd51f2a..2581b4f 100644 --- a/app/views/admin/members/_member_for_thumbnail.html.erb +++ b/app/views/admin/members/_member_for_thumbnail.html.erb @@ -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' @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-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? %> <%= image_tag(member_for_thumbnail.avatar) %>