kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix comment and reply buttons

Browse source
This commit is contained in:
Riyad Preukschas 2013-01-02 20:49:27 +01:00
parent db2c15369c
commit 7335f366dc
4 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/notes.js
View file

@ -244,6 +244,7 @@ var NoteList = {
setupDiscussionNoteForm: function(dataHolder, form) { setupDiscussionNoteForm: function(dataHolder, form) {
// setup note target // setup note target
form.attr("rel", dataHolder.data("discussionId")); form.attr("rel", dataHolder.data("discussionId"));
form.find("#note_commit_id").val(dataHolder.data("commitId"));
form.find("#note_line_code").val(dataHolder.data("lineCode")); form.find("#note_line_code").val(dataHolder.data("lineCode"));
form.find("#note_noteable_type").val(dataHolder.data("noteableType")); form.find("#note_noteable_type").val(dataHolder.data("noteableType"));
form.find("#note_noteable_id").val(dataHolder.data("noteableId")); form.find("#note_noteable_id").val(dataHolder.data("noteableId"));

2
app/controllers/commit_controller.rb
View file

@ -23,7 +23,7 @@ class CommitController < ProjectResourceController
@comments_allowed = @reply_allowed = true @comments_allowed = @reply_allowed = true
@comments_target = { noteable_type: 'Commit', @comments_target = { noteable_type: 'Commit',
noteable_id: @commit.id } commit_id: @commit.id }
respond_to do |format| respond_to do |format|
format.html do format.html do

1
app/views/notes/_diff_note_link.html.haml
View file

@ -4,6 +4,7 @@
class: "add-diff-note js-add-diff-note-button", class: "add-diff-note js-add-diff-note-button",
data: { noteable_type: note.noteable_type, data: { noteable_type: note.noteable_type,
noteable_id: note.noteable_id, noteable_id: note.noteable_id,
commit_id: note.commit_id,
line_code: note.line_code, line_code: note.line_code,
discussion_id: note.discussion_id }, discussion_id: note.discussion_id },
title: "Add a comment to this line" title: "Add a comment to this line"

1
app/views/notes/_discussion_reply_button.html.haml
View file

@ -2,6 +2,7 @@
class: "btn reply-btn js-discussion-reply-button", class: "btn reply-btn js-discussion-reply-button",
data: { noteable_type: note.noteable_type, data: { noteable_type: note.noteable_type,
noteable_id: note.noteable_id, noteable_id: note.noteable_id,
commit_id: note.commit_id,
line_code: note.line_code, line_code: note.line_code,
discussion_id: note.discussion_id }, discussion_id: note.discussion_id },
title: "Add a reply" do title: "Add a reply" do