diff options
| author | Phil Hughes <me@iamphill.com> | 2016-07-29 13:52:08 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-07-29 13:52:08 +0300 |
| commit | 4e679819f2bcb48664489ed78721fd455c45f95a (patch) | |
| tree | 9194eeda0e0b56d353396bd87592debc7623877f /app/views/projects/notes | |
| parent | efb74875cfe1a1e2b3696f0129b819fc8e204876 (diff) | |
Fixed failing tests
Diffstat (limited to 'app/views/projects/notes')
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index c708bd46387..044119e841d 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -22,7 +22,7 @@ - if access %span.note-role.hidden-xs= access - - if (note.resolvable? && can?(current_user, :resolve_note, note)) || (note.resolved? && !can?(current_user, :resolve_note, note)) + - if note.resolvable? %resolve-btn{ ":namespace-path" => "'#{note.project.namespace.path}'", ":project-path" => "'#{note.project.path}'", ":discussion-id" => "'#{note.discussion_id}'", @@ -30,6 +30,7 @@ ":resolved" => note.resolved?, ":can-resolve" => can?(current_user, :resolve_note, note), ":resolved-by" => "'#{note.resolved_by.try(:name)}'", + "v-show" => "#{(note.resolvable? && can?(current_user, :resolve_note, note)) || (note.resolved? && !can?(current_user, :resolve_note, note))}", "inline-template" => true, "v-ref:note_#{note.id}" => true } |