diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-10 12:09:45 +0200 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-10 12:09:45 +0200 |
| commit | fb0279f3113f58b1cbdbe04acabe874ac4d231f9 (patch) | |
| tree | 0638ecc05519895cb35eddfdeaef9a99f61378d8 | |
| parent | 3f72af9994554c66a51cdfb4302e48da0edd043a (diff) | |
| download | gitlab-ce-fb0279f3113f58b1cbdbe04acabe874ac4d231f9.tar.gz | |
Fix vote counting to only count main target notes (not mixed in ones)
| -rw-r--r-- | app/assets/javascripts/notes.js | 2 | ||||
| -rw-r--r-- | app/helpers/notes_helper.rb | 6 | ||||
| -rw-r--r-- | app/views/notes/_note.html.haml | 23 |
3 files changed, 15 insertions, 16 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index e1ad1d2f9e8..558643d504d 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -230,7 +230,7 @@ var NoteList = { updateVotes: function() { var votes = $("#votes .votes"); - var notes = $("#notes-list, #new-notes-list").find(".note.vote"); + var notes = $("#notes-list, #new-notes-list").find(".note .vote"); // only update if there is a vote display if (votes.size()) { diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index 3e875023c53..ba02ca6bd49 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -12,11 +12,5 @@ module NotesHelper !@mixed_targets || @main_target_type == note.noteable_type end - def note_vote_class(note) - if note.upvote? - "vote upvote" - elsif note.downvote? - "vote downvote" - end end end diff --git a/app/views/notes/_note.html.haml b/app/views/notes/_note.html.haml index 5234e55dcd0..57946163b56 100644 --- a/app/views/notes/_note.html.haml +++ b/app/views/notes/_note.html.haml @@ -1,4 +1,4 @@ -%li{id: dom_id(note), class: "note #{note_vote_class(note)}"} +%li{id: dom_id(note), class: "note"} = image_tag gravatar_icon(note.author.email), class: "avatar s32" %div.note-author %strong= note.author_name @@ -6,14 +6,19 @@ %cite.cgray = time_ago_in_words(note.updated_at) ago - - if note.upvote? - %span.label.label-success - %i.icon-thumbs-up - \+1 - - if note.downvote? - %span.label.label-error - %i.icon-thumbs-down - \-1 + + -# only show vote if it's a note for the main target + - if note_for_main_target?(note) + - if note.upvote? + %span.vote.upvote.label.label-success + %i.icon-thumbs-up + \+1 + - if note.downvote? + %span.vote.downvote.label.label-error + %i.icon-thumbs-down + \-1 + + -# remove button - if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project) = link_to [@project, note], confirm: 'Are you sure?', method: :delete, remote: true, class: "cred delete-note btn very_small" do %i.icon-trash |