kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Remove duplicate attributes from discussion entity and move note.can_edit into note.current_user

This commit is contained in:
Douwe Maan 2017-06-26 19:39:40 -05:00 committed by Fatih Acet
parent ebf9155113
commit cf926f6b7f
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/serializers/discussion_entity.rb
View File

@ -3,18 +3,8 @@ class DiscussionEntity < Grape::Entity
expose :id, :reply_id
expose :expanded?, as: :expanded
expose :author, using: UserEntity
expose :created_at
expose :last_updated_at, if: -> (discussion, _) { discussion.updated? }
expose :last_updated_by, if: -> (discussion, _) { discussion.updated? }, using: UserEntity
expose :notes, using: NoteEntity
expose :individual_note?, as: :individual_note
expose :can_reply do |discussion|
can?(request.current_user, :create_note, discussion.project)
end
end

6
app/serializers/note_entity.rb
View File

@ -17,8 +17,10 @@ class NoteEntity < API::Entities::Note
expose :last_edited_at, if: -> (note, _) { note.is_edited? }
expose :last_edited_by, using: UserEntity, if: -> (note, _) { note.is_edited? }
expose :can_edit do |note|
Ability.can_edit_note?(request.current_user, note)
expose :current_user do
expose :can_edit do |note|
Ability.can_edit_note?(request.current_user, note)
end
end
expose :system_note_icon_name, if: -> (note, _) { note.system? } do |note|