From 057563d37a932e5876cae9378e5aaa1fdc75dfe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Sun, 8 Nov 2015 13:20:36 +0100 Subject: [PATCH 1/2] shows author avatar in prop/deb only if not hidden --- app/views/shared/_author_info.html.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/shared/_author_info.html.erb b/app/views/shared/_author_info.html.erb index b51d3a261..ef46a84bd 100644 --- a/app/views/shared/_author_info.html.erb +++ b/app/views/shared/_author_info.html.erb @@ -1,11 +1,10 @@ -<%= avatar_image(resource.author, seed: resource.author_id, size: 32, class: 'author-photo') %> - <% if resource.author.hidden? || resource.author.erased? %> <%= t("shared.author_info.author_deleted") %> <% else %> + <%= avatar_image(resource.author, seed: resource.author_id, size: 32, class: 'author-photo') %> <%= link_to resource.author.name, user_path(resource.author) %> From cc5babe76414946910e6e7a57d1edbdfea3685d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Sun, 8 Nov 2015 13:21:08 +0100 Subject: [PATCH 2/2] hides comment's author avatar for erased users --- app/views/comments/_comment.html.erb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index def344f16..9178f0b9b 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -14,14 +14,13 @@ <% elsif comment.as_moderator? %> <%= image_tag("moderator_avatar.png", size: 32, class: "moderator-avatar left") %> <% else %> - <% if comment.user.organization? %> + <% if comment.user.hidden? || comment.user.erased? %> + + <% elsif comment.user.organization? %> <%= image_tag("collective_avatar.png", size: 32, class: "avatar left") %> <% else %> <%= avatar_image(comment.user, seed: comment.user_id, size: 32, class: "left") %> <% end %> - <% if comment.user.hidden? || comment.user.erased? %> - - <% end %> <% end %>