From 42269e32615565992d2253ecef93cbba58f5d7d9 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 17 Jul 2019 08:37:54 +1200 Subject: [PATCH 1/2] Comment out member avatar until we work out why it's breaking --- app/views/notifications/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml index 484fe6c10..fb28cb6e7 100644 --- a/app/views/notifications/index.html.haml +++ b/app/views/notifications/index.html.haml @@ -23,7 +23,7 @@ .col-6.col-md-3.text-right = link_to n.sender do %h3 - = render 'members/tiny', member: n.sender + /= render 'members/tiny', member: n.sender = n.sender = render 'members/follow_buttons', member: n.sender .card-footer From e0dcd0226e5251d8a5b11cf4fdfc1f762c6835a9 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 17 Jul 2019 09:09:16 +1200 Subject: [PATCH 2/2] Handle messages from deleted members --- app/views/notifications/index.html.haml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml index fb28cb6e7..d6ac4b5b3 100644 --- a/app/views/notifications/index.html.haml +++ b/app/views/notifications/index.html.haml @@ -21,11 +21,14 @@ %strong unread = n.created_at .col-6.col-md-3.text-right - = link_to n.sender do - %h3 - /= render 'members/tiny', member: n.sender - = n.sender - = render 'members/follow_buttons', member: n.sender + - if n.sender.present? + = link_to n.sender do + %h3 + = render 'members/tiny', member: n.sender + = n.sender + = render 'members/follow_buttons', member: n.sender + - else + Member deleted .card-footer = link_to 'Read', n, class: 'btn btn-primary' = link_to 'Reply', reply_link(n), class: 'btn btn-secondary'