Don't add js-task-list-container to things the user can't edit

This commit is contained in:
Robert Speicher 2015-04-29 20:34:43 -04:00
parent 5c7b91e29b
commit 725ff58bc8
4 changed files with 8 additions and 4 deletions

View file

@ -9,6 +9,10 @@ module NotesHelper
hidden_field_tag(:target_id, note.noteable.id)
end
def note_editable?(note)
note.editable? && can?(current_user, :admin_note, note)
end
def link_to_commit_diff_line_note(note)
if note.for_commit_diff_line?
link_to(

View file

@ -31,7 +31,7 @@
= gfm escape_once(@issue.title)
%div
- if @issue.description.present?
.description.js-task-list-container
.description{class: can?(current_user, :modify_issue, @issue) ? 'js-task-list-container' : ''}
.wiki
= preserve do
= markdown(@issue.description)

View file

@ -3,7 +3,7 @@
%div
- if @merge_request.description.present?
.description.js-task-list-container
.description{class: can?(current_user, :modify_merge_request, @merge_request) ? 'js-task-list-container' : ''}
.wiki
= preserve do
= markdown(@merge_request.description)

View file

@ -13,7 +13,7 @@
= icon('link')
Link here
 
- if can?(current_user, :admin_note, note) && note.editable?
- if note_editable?(note)
= link_to '#', title: 'Edit comment', class: 'js-note-edit' do
= icon('pencil-square-o')
Edit
@ -50,7 +50,7 @@
\-1
.note-body.js-task-list-container
.note-body{class: note_editable?(note) ? 'js-task-list-container' : ''}
.note-text
= preserve do
= markdown(note.note, {no_header_anchors: true})