2013-06-23 12:47:22 -04:00
|
|
|
class Projects::NotesController < Projects::ApplicationController
|
2016-05-25 15:07:36 -04:00
|
|
|
include ToggleAwardEmoji
|
|
|
|
|
2011-10-08 17:36:38 -04:00
|
|
|
# Authorize
|
2015-04-16 08:03:37 -04:00
|
|
|
before_action :authorize_read_note!
|
2015-06-26 10:44:21 -04:00
|
|
|
before_action :authorize_create_note!, only: [:create]
|
2015-04-16 08:03:37 -04:00
|
|
|
before_action :authorize_admin_note!, only: [:update, :destroy]
|
2016-08-12 17:24:09 -04:00
|
|
|
before_action :authorize_resolve_note!, only: [:resolve, :unresolve]
|
2016-04-16 15:09:08 -04:00
|
|
|
before_action :find_current_user_notes, only: [:index]
|
2011-10-08 17:36:38 -04:00
|
|
|
|
2012-02-24 02:16:06 -05:00
|
|
|
def index
|
2014-04-28 06:42:01 -04:00
|
|
|
current_fetched_at = Time.now.to_i
|
2012-10-29 10:56:17 -04:00
|
|
|
|
2014-04-28 06:21:49 -04:00
|
|
|
notes_json = { notes: [], last_fetched_at: current_fetched_at }
|
2012-10-10 06:06:30 -04:00
|
|
|
|
2013-12-25 15:32:23 -05:00
|
|
|
@notes.each do |note|
|
2016-01-19 12:17:56 -05:00
|
|
|
next if note.cross_reference_not_visible_for?(current_user)
|
|
|
|
|
|
|
|
notes_json[:notes] << note_json(note)
|
2013-11-29 07:46:40 -05:00
|
|
|
end
|
2013-12-25 15:32:23 -05:00
|
|
|
|
|
|
|
render json: notes_json
|
2012-02-24 02:16:06 -05:00
|
|
|
end
|
|
|
|
|
2011-10-08 17:36:38 -04:00
|
|
|
def create
|
2014-06-26 09:49:22 -04:00
|
|
|
@note = Notes::CreateService.new(project, current_user, note_params).execute
|
2011-10-08 17:36:38 -04:00
|
|
|
|
2016-06-21 07:35:09 -04:00
|
|
|
if @note.is_a?(Note)
|
|
|
|
Banzai::NoteRenderer.render([@note], @project, current_user)
|
|
|
|
end
|
|
|
|
|
2011-10-08 17:36:38 -04:00
|
|
|
respond_to do |format|
|
2016-05-17 13:28:17 -04:00
|
|
|
format.json { render json: note_json(@note) }
|
2015-10-20 03:28:28 -04:00
|
|
|
format.html { redirect_back_or_default }
|
2011-10-08 17:36:38 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2013-12-25 15:32:23 -05:00
|
|
|
def update
|
2015-07-30 08:45:54 -04:00
|
|
|
@note = Notes::UpdateService.new(project, current_user, note_params).execute(note)
|
2011-10-08 17:36:38 -04:00
|
|
|
|
2016-06-21 07:35:09 -04:00
|
|
|
if @note.is_a?(Note)
|
|
|
|
Banzai::NoteRenderer.render([@note], @project, current_user)
|
|
|
|
end
|
|
|
|
|
2011-10-08 17:36:38 -04:00
|
|
|
respond_to do |format|
|
2016-01-19 12:17:56 -05:00
|
|
|
format.json { render json: note_json(@note) }
|
2015-10-20 03:28:28 -04:00
|
|
|
format.html { redirect_back_or_default }
|
2011-10-08 17:36:38 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2013-12-25 15:32:23 -05:00
|
|
|
def destroy
|
2014-08-29 08:19:35 -04:00
|
|
|
if note.editable?
|
2016-04-05 19:21:02 -04:00
|
|
|
Notes::DeleteService.new(project, current_user).execute(note)
|
2014-08-29 08:19:35 -04:00
|
|
|
end
|
2013-06-25 18:46:07 -04:00
|
|
|
|
|
|
|
respond_to do |format|
|
2016-03-15 21:16:25 -04:00
|
|
|
format.js { head :ok }
|
2013-06-25 18:46:07 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def delete_attachment
|
2013-12-25 15:32:23 -05:00
|
|
|
note.remove_attachment!
|
|
|
|
note.update_attribute(:attachment, nil)
|
2013-06-25 18:46:07 -04:00
|
|
|
|
|
|
|
respond_to do |format|
|
2016-03-15 21:16:25 -04:00
|
|
|
format.js { head :ok }
|
2013-06-25 18:46:07 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-04 10:00:39 -04:00
|
|
|
def resolve
|
2016-07-26 00:43:47 -04:00
|
|
|
return render_404 unless note.resolvable?
|
|
|
|
|
|
|
|
note.resolve!(current_user)
|
|
|
|
|
2016-08-15 19:45:23 -04:00
|
|
|
MergeRequests::ResolvedDiscussionNotificationService.new(project, current_user).execute(note.noteable)
|
2016-08-03 20:16:37 -04:00
|
|
|
|
2016-07-28 22:09:36 -04:00
|
|
|
discussion = note.discussion
|
2016-07-27 13:34:04 -04:00
|
|
|
|
2016-07-26 10:47:19 -04:00
|
|
|
render json: {
|
2016-07-27 13:34:04 -04:00
|
|
|
resolved_by: note.resolved_by.try(:name),
|
2016-07-28 22:09:36 -04:00
|
|
|
discussion_headline_html: (view_to_html_string('discussions/_headline', discussion: discussion) if discussion)
|
2016-07-26 10:47:19 -04:00
|
|
|
}
|
2016-07-04 10:00:39 -04:00
|
|
|
end
|
|
|
|
|
2016-07-26 00:43:47 -04:00
|
|
|
def unresolve
|
|
|
|
return render_404 unless note.resolvable?
|
|
|
|
|
|
|
|
note.unresolve!
|
|
|
|
|
2016-07-28 22:09:36 -04:00
|
|
|
discussion = note.discussion
|
2016-07-27 13:34:04 -04:00
|
|
|
|
|
|
|
render json: {
|
2016-07-28 22:09:36 -04:00
|
|
|
discussion_headline_html: (view_to_html_string('discussions/_headline', discussion: discussion) if discussion)
|
2016-07-27 13:34:04 -04:00
|
|
|
}
|
2016-07-05 12:27:07 -04:00
|
|
|
end
|
|
|
|
|
2013-12-25 15:32:23 -05:00
|
|
|
private
|
|
|
|
|
|
|
|
def note
|
|
|
|
@note ||= @project.notes.find(params[:id])
|
|
|
|
end
|
2016-05-25 15:07:36 -04:00
|
|
|
alias_method :awardable, :note
|
2013-12-25 15:32:23 -05:00
|
|
|
|
2016-07-20 18:18:18 -04:00
|
|
|
def note_html(note)
|
2013-12-25 15:32:23 -05:00
|
|
|
render_to_string(
|
|
|
|
"projects/notes/_note",
|
|
|
|
layout: false,
|
|
|
|
formats: [:html],
|
|
|
|
locals: { note: note }
|
|
|
|
)
|
|
|
|
end
|
|
|
|
|
2016-07-20 18:18:18 -04:00
|
|
|
def diff_discussion_html(discussion)
|
|
|
|
return unless discussion.diff_discussion?
|
2016-01-19 12:17:56 -05:00
|
|
|
|
2015-06-05 18:24:05 -04:00
|
|
|
if params[:view] == 'parallel'
|
2016-07-20 18:18:18 -04:00
|
|
|
template = "discussions/_parallel_diff_discussion"
|
2015-06-05 18:24:05 -04:00
|
|
|
locals =
|
|
|
|
if params[:line_type] == 'old'
|
2016-07-20 18:18:18 -04:00
|
|
|
{ discussion_left: discussion, discussion_right: nil }
|
2015-06-05 18:24:05 -04:00
|
|
|
else
|
2016-07-20 18:18:18 -04:00
|
|
|
{ discussion_left: nil, discussion_right: discussion }
|
2016-01-27 10:59:16 -05:00
|
|
|
end
|
2015-06-05 18:24:05 -04:00
|
|
|
else
|
2016-07-20 18:18:18 -04:00
|
|
|
template = "discussions/_diff_discussion"
|
|
|
|
locals = { discussion: discussion }
|
2015-06-05 18:24:05 -04:00
|
|
|
end
|
|
|
|
|
2013-12-25 15:32:23 -05:00
|
|
|
render_to_string(
|
2015-06-05 18:24:05 -04:00
|
|
|
template,
|
2013-12-25 15:32:23 -05:00
|
|
|
layout: false,
|
|
|
|
formats: [:html],
|
2015-06-05 18:24:05 -04:00
|
|
|
locals: locals
|
2013-12-25 15:32:23 -05:00
|
|
|
)
|
|
|
|
end
|
|
|
|
|
2016-07-20 18:18:18 -04:00
|
|
|
def discussion_html(discussion)
|
|
|
|
return unless discussion.diff_discussion?
|
2014-06-25 03:14:35 -04:00
|
|
|
|
2014-06-24 07:57:59 -04:00
|
|
|
render_to_string(
|
2016-07-20 18:18:18 -04:00
|
|
|
"discussions/_discussion",
|
2014-06-24 07:57:59 -04:00
|
|
|
layout: false,
|
|
|
|
formats: [:html],
|
2016-07-20 18:18:18 -04:00
|
|
|
locals: { discussion: discussion }
|
2014-06-24 07:57:59 -04:00
|
|
|
)
|
|
|
|
end
|
|
|
|
|
2016-01-19 12:17:56 -05:00
|
|
|
def note_json(note)
|
2016-11-18 21:19:04 -05:00
|
|
|
attrs = {
|
|
|
|
award: false,
|
|
|
|
id: note.id
|
|
|
|
}
|
|
|
|
|
2016-05-17 13:28:17 -04:00
|
|
|
if note.is_a?(AwardEmoji)
|
2016-11-18 21:19:04 -05:00
|
|
|
attrs.merge!(
|
2016-05-17 13:28:17 -04:00
|
|
|
valid: note.valid?,
|
|
|
|
award: true,
|
|
|
|
name: note.name
|
2016-11-18 21:19:04 -05:00
|
|
|
)
|
2016-06-30 11:34:19 -04:00
|
|
|
elsif note.persisted?
|
2016-06-21 07:35:09 -04:00
|
|
|
Banzai::NoteRenderer.render([note], @project, current_user)
|
|
|
|
|
2016-11-18 21:19:04 -05:00
|
|
|
attrs.merge!(
|
2015-12-02 04:51:46 -05:00
|
|
|
valid: true,
|
2015-12-02 04:13:29 -05:00
|
|
|
discussion_id: note.discussion_id,
|
2016-07-20 18:18:18 -04:00
|
|
|
html: note_html(note),
|
|
|
|
note: note.note
|
2016-11-18 21:19:04 -05:00
|
|
|
)
|
2016-06-20 13:23:46 -04:00
|
|
|
|
2016-07-20 18:18:18 -04:00
|
|
|
if note.diff_note?
|
2016-08-15 19:45:23 -04:00
|
|
|
discussion = note.to_discussion
|
2016-07-20 18:18:18 -04:00
|
|
|
|
|
|
|
attrs.merge!(
|
|
|
|
diff_discussion_html: diff_discussion_html(discussion),
|
|
|
|
discussion_html: discussion_html(discussion)
|
|
|
|
)
|
|
|
|
|
|
|
|
# The discussion_id is used to add the comment to the correct discussion
|
|
|
|
# element on the merge request page. Among other things, the discussion_id
|
|
|
|
# contains the sha of head commit of the merge request.
|
|
|
|
# When new commits are pushed into the merge request after the initial
|
|
|
|
# load of the merge request page, the discussion elements will still have
|
|
|
|
# the old discussion_ids, with the old head commit sha. The new comment,
|
|
|
|
# however, will have the new discussion_id with the new commit sha.
|
|
|
|
# To ensure that these new comments will still end up in the correct
|
|
|
|
# discussion element, we also send the original discussion_id, with the
|
|
|
|
# old commit sha, along, and fall back on this value when no discussion
|
|
|
|
# element with the new discussion_id could be found.
|
|
|
|
if note.new_diff_note? && note.position != note.original_position
|
|
|
|
attrs[:original_discussion_id] = note.original_discussion_id
|
|
|
|
end
|
2016-06-20 13:23:46 -04:00
|
|
|
end
|
2015-12-02 04:13:29 -05:00
|
|
|
else
|
2016-11-18 21:19:04 -05:00
|
|
|
attrs.merge!(
|
2015-12-02 04:51:46 -05:00
|
|
|
valid: false,
|
|
|
|
errors: note.errors
|
2016-11-18 21:19:04 -05:00
|
|
|
)
|
2015-12-02 04:13:29 -05:00
|
|
|
end
|
2016-11-18 21:19:04 -05:00
|
|
|
|
2016-11-24 01:32:32 -05:00
|
|
|
attrs[:commands_changes] = note.commands_changes unless attrs[:award]
|
2016-11-18 21:19:04 -05:00
|
|
|
attrs
|
2013-12-25 15:32:23 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
def authorize_admin_note!
|
|
|
|
return access_denied! unless can?(current_user, :admin_note, note)
|
|
|
|
end
|
2014-06-26 09:49:22 -04:00
|
|
|
|
2016-07-26 00:43:47 -04:00
|
|
|
def authorize_resolve_note!
|
|
|
|
return access_denied! unless can?(current_user, :resolve_note, note)
|
|
|
|
end
|
|
|
|
|
2014-06-26 09:49:22 -04:00
|
|
|
def note_params
|
|
|
|
params.require(:note).permit(
|
|
|
|
:note, :noteable, :noteable_id, :noteable_type, :project_id,
|
2016-06-20 13:23:46 -04:00
|
|
|
:attachment, :line_code, :commit_id, :type, :position
|
2014-06-26 09:49:22 -04:00
|
|
|
)
|
|
|
|
end
|
2015-03-02 18:05:23 -05:00
|
|
|
|
|
|
|
def find_current_user_notes
|
2016-12-08 20:56:31 -05:00
|
|
|
@notes = NotesFinder.new(project, current_user, params).execute.inc_author
|
2015-03-02 18:05:23 -05:00
|
|
|
end
|
2011-10-08 17:36:38 -04:00
|
|
|
end
|