diff options
author | Ruben Davila <rdavila84@gmail.com> | 2016-11-19 05:19:04 +0300 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2016-11-19 05:19:04 +0300 |
commit | 452d1d0824f44664484c35a2acc7c008c8167196 (patch) | |
tree | 4fc0203967136f3a3f1d93fd42ae565f3afffc0a /app/controllers/projects/notes_controller.rb | |
parent | aea8baed3093c513560e9ac5ac0c5c99508d3001 (diff) |
Backport some changes done from Time Tracking feature in EE.
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
-rw-r--r-- | app/controllers/projects/notes_controller.rb | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 0948ad21649..f029fde2a2f 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -146,24 +146,26 @@ class Projects::NotesController < Projects::ApplicationController end def note_json(note) + attrs = { + award: false, + id: note.id + } + if note.is_a?(AwardEmoji) - { + attrs.merge!( valid: note.valid?, award: true, - id: note.id, name: note.name - } + ) elsif note.persisted? Banzai::NoteRenderer.render([note], @project, current_user) - attrs = { + attrs.merge!( valid: true, - id: note.id, discussion_id: note.discussion_id, html: note_html(note), - award: false, note: note.note - } + ) if note.diff_note? discussion = note.to_discussion @@ -188,15 +190,14 @@ class Projects::NotesController < Projects::ApplicationController attrs[:original_discussion_id] = note.original_discussion_id end end - - attrs else - { + attrs.merge!( valid: false, - award: false, errors: note.errors - } + ) end + + attrs end def authorize_admin_note! |