2012-09-14 14:52:24 +00:00
|
|
|
module NotesHelper
|
2015-03-02 23:05:23 +00:00
|
|
|
def note_target_fields(note)
|
2016-03-25 07:39:22 +00:00
|
|
|
if note.noteable
|
|
|
|
hidden_field_tag(:target_type, note.noteable.class.name.underscore) +
|
|
|
|
hidden_field_tag(:target_id, note.noteable.id)
|
|
|
|
end
|
2012-10-10 10:06:30 +00:00
|
|
|
end
|
|
|
|
|
2015-04-30 00:34:43 +00:00
|
|
|
def note_editable?(note)
|
|
|
|
note.editable? && can?(current_user, :admin_note, note)
|
|
|
|
end
|
|
|
|
|
2013-12-25 20:33:40 +00:00
|
|
|
def noteable_json(noteable)
|
|
|
|
{
|
|
|
|
id: noteable.id,
|
|
|
|
class: noteable.class.name,
|
|
|
|
resources: noteable.class.table_name,
|
|
|
|
project_id: noteable.project.id,
|
|
|
|
}.to_json
|
|
|
|
end
|
2014-06-06 20:15:54 +00:00
|
|
|
|
2016-07-07 22:05:34 +00:00
|
|
|
def diff_view_data
|
2016-07-07 22:09:19 +00:00
|
|
|
return {} unless @comments_target
|
2016-07-06 04:59:18 +00:00
|
|
|
|
2016-07-07 22:05:34 +00:00
|
|
|
@comments_target.slice(:noteable_id, :noteable_type, :commit_id)
|
2016-07-06 04:59:18 +00:00
|
|
|
end
|
|
|
|
|
2016-07-07 22:09:19 +00:00
|
|
|
def diff_view_line_data(line_code, position, line_type)
|
|
|
|
return if @diff_notes_disabled
|
2016-07-07 22:05:34 +00:00
|
|
|
|
2016-07-07 22:09:19 +00:00
|
|
|
use_legacy_diff_note = @use_legacy_diff_notes
|
2016-06-20 17:23:46 +00:00
|
|
|
# If the controller doesn't force the use of legacy diff notes, we
|
|
|
|
# determine this on a line-by-line basis by seeing if there already exist
|
|
|
|
# active legacy diff notes at this line, in which case newly created notes
|
|
|
|
# will use the legacy technology as well.
|
|
|
|
# We do this because the discussion_id values of legacy and "new" diff
|
|
|
|
# notes, which are used to group notes on the merge request discussion tab,
|
|
|
|
# are incompatible.
|
|
|
|
# If we didn't, diff notes that would show for the same line on the changes
|
|
|
|
# tab, would show in different discussions on the discussion tab.
|
2016-07-07 22:09:19 +00:00
|
|
|
use_legacy_diff_note ||= begin
|
2016-07-20 22:18:18 +00:00
|
|
|
discussion = @grouped_diff_discussions[line_code]
|
|
|
|
discussion && discussion.legacy_diff_discussion?
|
2016-07-07 22:09:19 +00:00
|
|
|
end
|
2016-07-07 22:05:34 +00:00
|
|
|
|
2016-07-07 22:09:19 +00:00
|
|
|
data = {
|
2016-07-06 04:59:18 +00:00
|
|
|
line_code: line_code,
|
|
|
|
line_type: line_type,
|
|
|
|
}
|
|
|
|
|
2016-07-07 22:09:19 +00:00
|
|
|
if use_legacy_diff_note
|
|
|
|
discussion_id = LegacyDiffNote.build_discussion_id(
|
2016-06-20 17:23:46 +00:00
|
|
|
@comments_target[:noteable_type],
|
|
|
|
@comments_target[:noteable_id] || @comments_target[:commit_id],
|
|
|
|
line_code
|
2016-07-06 04:59:18 +00:00
|
|
|
)
|
2016-07-07 22:09:19 +00:00
|
|
|
|
|
|
|
data.merge!(
|
|
|
|
note_type: LegacyDiffNote.name,
|
|
|
|
discussion_id: discussion_id
|
|
|
|
)
|
2016-06-20 17:23:46 +00:00
|
|
|
else
|
|
|
|
discussion_id = DiffNote.build_discussion_id(
|
2016-07-07 22:09:19 +00:00
|
|
|
@comments_target[:noteable_type],
|
|
|
|
@comments_target[:noteable_id] || @comments_target[:commit_id],
|
|
|
|
position
|
|
|
|
)
|
|
|
|
|
|
|
|
data.merge!(
|
|
|
|
position: position.to_json,
|
|
|
|
note_type: DiffNote.name,
|
|
|
|
discussion_id: discussion_id
|
|
|
|
)
|
2016-07-06 04:59:18 +00:00
|
|
|
end
|
2016-07-07 22:09:19 +00:00
|
|
|
|
|
|
|
data
|
2014-06-06 20:15:54 +00:00
|
|
|
end
|
2014-06-24 10:34:46 +00:00
|
|
|
|
2016-07-20 22:18:18 +00:00
|
|
|
def link_to_reply_discussion(discussion, line_type = nil)
|
2014-06-24 10:35:50 +00:00
|
|
|
return unless current_user
|
|
|
|
|
2016-07-20 22:18:18 +00:00
|
|
|
data = discussion.reply_attributes.merge(line_type: line_type)
|
2016-05-10 22:41:46 +00:00
|
|
|
|
2016-07-14 13:28:58 +00:00
|
|
|
button_tag 'Reply...', class: 'btn btn-text-field js-discussion-reply-button',
|
|
|
|
data: data, title: 'Add a reply'
|
2014-06-24 10:34:46 +00:00
|
|
|
end
|
2016-06-28 22:14:11 +00:00
|
|
|
|
|
|
|
def note_max_access_for_user(note)
|
2016-06-29 13:11:42 +00:00
|
|
|
@max_access_by_user_id ||= Hash.new do |hash, key|
|
|
|
|
project = key[:project]
|
|
|
|
hash[key] = project.team.human_max_access(key[:user_id])
|
|
|
|
end
|
2016-06-28 22:14:11 +00:00
|
|
|
|
2016-06-29 13:11:42 +00:00
|
|
|
full_key = { project: note.project, user_id: note.author_id }
|
|
|
|
@max_access_by_user_id[full_key]
|
2016-06-28 22:14:11 +00:00
|
|
|
end
|
2016-06-20 16:57:10 +00:00
|
|
|
|
2016-07-20 22:18:18 +00:00
|
|
|
def discussion_diff_path(discussion)
|
|
|
|
return unless discussion.diff_discussion?
|
2016-06-20 16:57:10 +00:00
|
|
|
|
2016-07-20 22:18:18 +00:00
|
|
|
if discussion.for_merge_request? && discussion.active?
|
|
|
|
diffs_namespace_project_merge_request_path(discussion.project.namespace, discussion.project, discussion.noteable, anchor: discussion.line_code)
|
|
|
|
elsif discussion.for_commit?
|
|
|
|
namespace_project_commit_path(discussion.project.namespace, discussion.project, discussion.noteable, anchor: discussion.line_code)
|
2016-06-20 16:57:10 +00:00
|
|
|
end
|
|
|
|
end
|
2012-09-14 14:52:24 +00:00
|
|
|
end
|