diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-29 19:37:37 +0100 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-12-03 22:51:55 +0100 |
| commit | 6c6f415cae54be4dae4522e901ed55c9dae04a15 (patch) | |
| tree | 6db6a4cdf9e22d77956cca9748843437f410868f | |
| parent | 5c2f6d7f050222d2601218a0bec1dadcee5fcfa0 (diff) | |
| download | gitlab-ce-6c6f415cae54be4dae4522e901ed55c9dae04a15.tar.gz | |
Fix appending diff line notes
| -rw-r--r-- | app/contexts/notes/create_context.rb | 4 | ||||
| -rw-r--r-- | app/views/notes/_create_per_line_note.js.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/contexts/notes/create_context.rb b/app/contexts/notes/create_context.rb index d93adb835ef..1367dff4699 100644 --- a/app/contexts/notes/create_context.rb +++ b/app/contexts/notes/create_context.rb @@ -3,8 +3,8 @@ module Notes def execute note = project.notes.new(params[:note]) note.author = current_user - note.notify = true if params[:notify] == '1' - note.notify_author = true if params[:notify_author] == '1' + note.notify = params[:notify].present? + note.notify_author = params[:notify_author].present? note.save note end diff --git a/app/views/notes/_create_per_line_note.js.haml b/app/views/notes/_create_per_line_note.js.haml index eea9eb38be4..6f74699996b 100644 --- a/app/views/notes/_create_per_line_note.js.haml +++ b/app/views/notes/_create_per_line_note.js.haml @@ -6,7 +6,7 @@ // find the reply button for this line // (might not be there if this is the first note) - var trRpl = $("a.line_note_reply_link[data-line-code='#{note.line_code}']").closest("tr"); + var trRpl = $("a.line_note_reply_link[data-noteable-type='#{note.noteable_type}'][data-noteable-id='#{note.noteable_id}'][data-line-code='#{note.line_code}']").closest("tr"); if (trRpl.size() == 0) { // find the commented line ... var trEl = $(".#{note.line_code}").parent(); |