Reply button, Comments for Merge Request diff
This commit is contained in:
parent
215a01f63c
commit
d41d8ffb02
13 changed files with 53 additions and 15 deletions
|
@ -3,6 +3,8 @@
|
|||
.clear
|
||||
%hr
|
||||
%ul#notes-list
|
||||
.loading
|
||||
|
||||
|
||||
:javascript
|
||||
$('.delete-note').live('ajax:success', function() {
|
||||
|
|
3
app/views/notes/_reply_button.html.haml
Normal file
3
app/views/notes/_reply_button.html.haml
Normal file
|
@ -0,0 +1,3 @@
|
|||
%tr.line_notes_row.reply
|
||||
%td{:colspan => 3}
|
||||
= link_to "Reply", "#", :class => "line_note_reply_link", "line_code" => line_code, :title => "Add note for this line"
|
|
@ -6,7 +6,7 @@
|
|||
= time_ago_in_words(note.updated_at)
|
||||
ago
|
||||
- if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project)
|
||||
= link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note right"
|
||||
%strong= link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note btn small"
|
||||
|
||||
%div.note-title
|
||||
= markdown(note.note)
|
||||
|
|
|
@ -3,7 +3,10 @@
|
|||
:plain
|
||||
$(".per_line_form").hide();
|
||||
$('#new_note textarea').val("");
|
||||
$(".#{@note.line_code}").parent().after("#{escape_javascript(render :partial => "notes/per_line_show", :locals => {:note => @note})}");
|
||||
$("a.line_note_reply_link[line_code='#{@note.line_code}']").closest("tr").remove();
|
||||
var trEl = $(".#{@note.line_code}").parent();
|
||||
trEl.after("#{escape_javascript(render :partial => "notes/per_line_show", :locals => {:note => @note})}");
|
||||
trEl.after("#{escape_javascript(render :partial => "notes/reply_button", :locals => {:line_code => @note.line_code})}");
|
||||
- else
|
||||
:plain
|
||||
$("#new_note .errors").remove();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue