From: Andy Allan Date: Wed, 28 Aug 2019 13:20:21 +0000 (+0200) Subject: Merge pull request #2266 from systemed/patch-2 X-Git-Tag: live~2505 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a7092491b069de43bb8d8c30d3526e7095c5cc98?hp=-c Merge pull request #2266 from systemed/patch-2 Add user_ class to diary entry div --- a7092491b069de43bb8d8c30d3526e7095c5cc98 diff --combined app/views/diary_entries/_diary_entry.html.erb index c7dbec386,bbc83c740..ef983ebde --- a/app/views/diary_entries/_diary_entry.html.erb +++ b/app/views/diary_entries/_diary_entry.html.erb @@@ -1,4 -1,4 +1,4 @@@ -
+
<% if !@user %> <%= user_thumbnail diary_entry.user %> @@@ -37,7 -37,7 +37,7 @@@ <% end %> - <% if current_user && current_user.administrator? %> + <% if can? :hide, DiaryEntry %>
  • <% if diary_entry.visible %> <%= link_to t(".hide_link"), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t(".confirm") } %>