X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f222c49dd60ea505f2c1631efa02fbd9f0f5667..af75e66fd099772aeccfb7bea6e33cb333c381a9:/app/abilities/ability.rb diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb index 643465c54..907712328 100644 --- a/app/abilities/ability.rb +++ b/app/abilities/ability.rb @@ -4,10 +4,9 @@ class Ability include CanCan::Ability def initialize(user) - can [:relation, :relation_history, :way, :way_history, :node, :node_history, - :changeset, :query], :browse - can [:show], OldNode - can [:show], OldWay + can :query, :browse + can :show, [Node, Way, Relation] + can [:index, :show], [OldNode, OldWay, OldRelation] can [:show, :new], Note can :search, :direction can [:index, :permalink, :edit, :help, :fixthemap, :offline, :export, :about, :communities, :preview, :copyright, :key, :id], :site @@ -16,15 +15,16 @@ class Ability can [:token, :request_token, :access_token, :test_request], :oauth if Settings.status != "database_offline" - can [:index, :feed], Changeset + can [:index, :feed, :show], Changeset can :index, ChangesetComment can [:confirm, :confirm_resend, :confirm_email], :confirmation - can [:index, :rss, :show, :comments], DiaryEntry + can [:index, :rss, :show], DiaryEntry + can :index, DiaryComment can [:index], Note can [:new, :create, :edit, :update], :password can [:index, :show], Redaction can [:new, :create, :destroy], :session - can [:index, :show, :data, :georss, :picture, :icon], Trace + can [:index, :show, :data, :georss], Trace can [:terms, :new, :create, :save, :suspended, :show, :auth_success, :auth_failure], User can [:index, :show, :blocks_on, :blocks_by], UserBlock end @@ -35,13 +35,16 @@ class Ability can [:show], :deletion if Settings.status != "database_offline" + can [:subscribe, :unsubscribe], Changeset can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication can [:index, :new, :create, :show, :edit, :update, :destroy], :oauth2_application can [:index, :destroy], :oauth2_authorized_application can [:new, :show, :create, :destroy], :oauth2_authorization can [:edit, :update, :destroy], :account can [:show], :dashboard - can [:new, :create, :edit, :update, :comment, :subscribe, :unsubscribe], DiaryEntry + can [:new, :create, :subscribe, :unsubscribe], DiaryEntry + can :update, DiaryEntry, :user => user + can [:create], DiaryComment can [:make_friend, :remove_friend], Friendship can [:new, :create, :reply, :show, :inbox, :outbox, :muted, :mark, :unmute, :destroy], Message can [:close, :reopen], Note @@ -53,7 +56,7 @@ class Ability can [:index, :create, :destroy], UserMute if user.moderator? - can [:hide, :unhide, :hidecomment, :unhidecomment], DiaryEntry + can [:hide, :unhide], [DiaryEntry, DiaryComment] can [:index, :show, :resolve, :ignore, :reopen], Issue can :create, IssueComment can [:new, :create, :edit, :update, :destroy], Redaction @@ -61,7 +64,7 @@ class Ability end if user.administrator? - can [:hide, :unhide, :hidecomment, :unhidecomment], DiaryEntry + can [:hide, :unhide], [DiaryEntry, DiaryComment] can [:index, :show, :resolve, :ignore, :reopen], Issue can :create, IssueComment can [:set_status, :destroy, :index], User