summaryrefslogtreecommitdiff
path: root/app/controllers/projects/notes_controller.rb
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-11-11 15:12:51 +0200
committerValery Sizov <vsv2711@gmail.com>2015-11-19 01:25:27 +0200
commitfd2c0fe446c7f761b845c91307ef8110d869e8e8 (patch)
tree1a2b6c53f6a4c5c24fcb57adad7a2cd115e72623 /app/controllers/projects/notes_controller.rb
parent61867abeeccf9e6f65ba38c365d8bdf6b61387f4 (diff)
downloadgitlab-ce-fd2c0fe446c7f761b845c91307ef8110d869e8e8.tar.gz
award emoji
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
-rw-r--r--app/controllers/projects/notes_controller.rb25
1 files changed, 24 insertions, 1 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 41cd08c93c6..357b292980d 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -3,7 +3,7 @@ class Projects::NotesController < Projects::ApplicationController
before_action :authorize_read_note!
before_action :authorize_create_note!, only: [:create]
before_action :authorize_admin_note!, only: [:update, :destroy]
- before_action :find_current_user_notes, except: [:destroy, :delete_attachment]
+ before_action :find_current_user_notes, except: [:destroy, :delete_attachment, :award_toggle]]
def index
current_fetched_at = Time.now.to_i
@@ -58,6 +58,27 @@ class Projects::NotesController < Projects::ApplicationController
end
end
+ def award_toggle
+ noteable = params[:noteable_type] == "Issue" ? Issue : MergeRequest
+ noteable = noteable.find(params[:noteable_id])
+ data = {
+ noteable: noteable,
+ author: current_user,
+ is_award: true,
+ note: params[:emoji]
+ }
+
+ note = project.notes.find_by(data)
+
+ if note
+ note.destroy
+ else
+ project.notes.create(data)
+ end
+
+ render json: {ok: true}
+ end
+
private
def note
@@ -111,6 +132,8 @@ class Projects::NotesController < Projects::ApplicationController
id: note.id,
discussion_id: note.discussion_id,
html: note_to_html(note),
+ award: note.is_award,
+ note: note.note,
discussion_html: note_to_discussion_html(note),
discussion_with_diff_html: note_to_discussion_with_diff_html(note)
}