diff options
| author | ZJ van de Weg <zegerjan@gitlab.com> | 2016-05-25 21:07:36 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-06-06 11:03:39 +0200 |
| commit | 2f9c2149a38e8a4067cb50c1cd1bbb1e72c263b3 (patch) | |
| tree | 89b1f8d0cf86a328d8a8d276b79e5321fbdd43dc /app/controllers | |
| parent | fc809d689a03e69c581c1bb8ed0cf246953a7c08 (diff) | |
| download | gitlab-ce-2f9c2149a38e8a4067cb50c1cd1bbb1e72c263b3.tar.gz | |
Backend awardables on comments
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/toggle_award_emoji.rb | 11 | ||||
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/app/controllers/concerns/toggle_award_emoji.rb b/app/controllers/concerns/toggle_award_emoji.rb index 09ff44f291b..036777c80c1 100644 --- a/app/controllers/concerns/toggle_award_emoji.rb +++ b/app/controllers/concerns/toggle_award_emoji.rb @@ -9,13 +9,22 @@ module ToggleAwardEmoji name = params.require(:name) awardable.toggle_award_emoji(name, current_user) - TodoService.new.new_award_emoji(awardable, current_user) + TodoService.new.new_award_emoji(to_todoable(awardable), current_user) render json: { ok: true } end private + def to_todoable(awardable) + case awardable + when Note + awardable.noteable + else + awardable + end + end + def awardable raise NotImplementedError end diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index c205474e999..836f79ff080 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -1,4 +1,6 @@ class Projects::NotesController < Projects::ApplicationController + include ToggleAwardEmoji + # Authorize before_action :authorize_read_note! before_action :authorize_create_note!, only: [:create] @@ -61,6 +63,7 @@ class Projects::NotesController < Projects::ApplicationController def note @note ||= @project.notes.find(params[:id]) end + alias_method :awardable, :note def note_to_html(note) render_to_string( |