Check for show redactions ability instead of moderator role when brow…

…sing elements
openstreetmap · Mar 2, 2024 · bfaa37e · bfaa37e
1 parent 957f139
commit bfaa37e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
@@ -54,7 +54,7 @@ def initialize(user)
         can [:index, :create, :destroy], UserMute
 
         if user.moderator?
-          can :show_redactions, [:browse, OldNode, OldWay, OldRelation]
+          can :show_redactions, [:browse, Node, Way, Relation, OldNode, OldWay, OldRelation]
           can [:hide, :unhide, :hidecomment, :unhidecomment], DiaryEntry
           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment

diff --git a/app/views/browse/_version_actions.erb b/app/views/browse/_version_actions.erb
@@ -3,7 +3,7 @@
   <% if !@feature.redacted? %>
     &middot;
     <%= link_to t("browse.download_xml"), :controller => "api/old_#{@type.pluralize}", :action => :version %>
-  <% elsif current_user&.moderator? %>
+  <% elsif can? :show_redactions, @feature %>
     &middot;
     <% if !params[:show_redactions] %>
       <%= link_to t("browse.view_redacted_data"), :params => { :show_redactions => true } %>

diff --git a/app/views/browse/feature.html.erb b/app/views/browse/feature.html.erb
@@ -18,7 +18,7 @@
     &middot;
   <% end %>
     <%= link_to t("browse.view_history"), :action => "#{@type}_history" %>
-  <% if current_user&.moderator? %>
+  <% if can? :show_redactions, @feature %>
     &middot;
     <%= link_to(t("browse.view_unredacted_history"), :action => "#{@type}_history", :params => { :show_redactions => true }) %>
   <% end %>

diff --git a/app/views/browse/history.html.erb b/app/views/browse/history.html.erb
@@ -11,7 +11,7 @@
   <% if params[:show_redactions] %>
     &middot;
     <%= link_to(t("browse.view_history"), :action => "#{@type}_history") %>
-  <% elsif current_user&.moderator? %>
+  <% elsif can? :show_redactions, @feature %>
     &middot;
     <%= link_to(t("browse.view_unredacted_history"), :action => "#{@type}_history", :params => { :show_redactions => true }) %>
   <% end %>