X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2142ff02c2442d28580ff99080bc1219c2bfe59f..8ebfdbc1ffacee695ca773f3b3c8af02bb41b8c1:/app/abilities/ability.rb

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index 897c3410c..5b1d7df68 100644
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -36,12 +36,13 @@ class Ability
 
       if Settings.status != "database_offline"
         can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
-        can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
+        can [:new, :create, :edit, :update, :comment, :subscribe, :unsubscribe], DiaryEntry
+        can [:make_friend, :remove_friend], Friendship
         can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
         can [:close, :reopen], Note
         can [:new, :create], Report
-        can [:mine, :new, :create, :edit, :update, :delete], Trace
-        can [:account, :go_public, :make_friend, :remove_friend], User
+        can [:mine, :new, :create, :edit, :update, :destroy], Trace
+        can [:account, :go_public], User
 
         if user.moderator?
           can [:hide, :hidecomment], DiaryEntry
@@ -52,7 +53,7 @@ class Ability
         end
 
         if user.administrator?
-          can [:hide, :hidecomment], DiaryEntry
+          can [:hide, :unhide, :hidecomment, :unhidecomment], DiaryEntry
           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment
           can [:set_status, :delete, :index], User