Remove the red colour override, and use the bootstrap default

[rails.git] / app / abilities / ability.rb

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index f0cebb380a46ba2ee2572fc54884e0eb8bd93353..e72b4e85b64d55e6787cca9604c2dca29e0e3c78 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -37,11 +37,12 @@ class Ability
       if Settings.status != "database_offline"
         can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
         can [:new, :create, :edit, :update, :comment, :subscribe, :unsubscribe], DiaryEntry
       if Settings.status != "database_offline"
         can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
         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, :destroy], Trace
         can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
         can [:close, :reopen], Note
         can [:new, :create], Report
         can [:mine, :new, :create, :edit, :update, :destroy], Trace

-        can [:account, :go_public, :make_friend, :remove_friend], User
+        can [:account, :go_public], User

 
         if user.moderator?
           can [:hide, :hidecomment], DiaryEntry
 
         if user.moderator?
           can [:hide, :hidecomment], DiaryEntry


@@ -55,7 +56,7 @@ class Ability
           can [:hide, :unhide, :hidecomment, :unhidecomment], DiaryEntry
           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment
           can [:hide, :unhide, :hidecomment, :unhidecomment], DiaryEntry
           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment

-          can [:set_status, :delete, :index], User
+          can [:set_status, :destroy, :index], User

           can [:grant, :revoke], UserRole
         end
       end
           can [:grant, :revoke], UserRole
         end
       end