Fix comment and reply buttons

Riyad Preukschas
1 parent db2c1536
Showing 4 changed files with 4 additions and 1 deletions Show diff stats
app/assets/javascripts/notes.js
app/controllers/commit_controller.rb
app/views/notes/_diff_note_link.html.haml
app/views/notes/_discussion_reply_button.html.haml
@@ -244,6 +244,7 @@ var NoteList = {
   setupDiscussionNoteForm: function(dataHolder, form) {
     // setup note target
     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_noteable_type").val(dataHolder.data("noteableType"));
     form.find("#note_noteable_id").val(dataHolder.data("noteableId"));
@@ -23,7 +23,7 @@ class CommitController &lt; ProjectResourceController
     @comments_allowed = @reply_allowed = true
     @comments_target  = { noteable_type: 'Commit',
-                          noteable_id: @commit.id }
+                          commit_id: @commit.id }
     respond_to do |format|
       format.html do
@@ -4,6 +4,7 @@
           class: "add-diff-note js-add-diff-note-button",
           data: { noteable_type: note.noteable_type,
                   noteable_id:   note.noteable_id,
+                  commit_id:     note.commit_id,
                   line_code:     note.line_code,
                   discussion_id: note.discussion_id },
           title: "Add a comment to this line"
@@ -2,6 +2,7 @@
           class: "btn reply-btn js-discussion-reply-button",
           data: { noteable_type: note.noteable_type,
                   noteable_id:   note.noteable_id,
+                  commit_id:     note.commit_id,
                   line_code:     note.line_code,
                   discussion_id: note.discussion_id },
           title: "Add a reply" do
	@@ -23,7 +23,7 @@ class CommitController < ProjectResourceController		@@ -23,7 +23,7 @@ class CommitController < ProjectResourceController
23		23
24	@comments_allowed = @reply_allowed = true	24	@comments_allowed = @reply_allowed = true
25	@comments_target = { noteable_type: 'Commit',	25	@comments_target = { noteable_type: 'Commit',
26	- noteable_id: @commit.id }	26	+ commit_id: @commit.id }
27		27
28	respond_to do \|format\|	28	respond_to do \|format\|
29	format.html do	29	format.html do