revert back vote buttons to issue and MR pages
This commit is contained in:
parent
ed777c7bcc
commit
a1b63e1252
4 changed files with 25 additions and 11 deletions
|
@ -9,6 +9,7 @@ v 8.4.0 (unreleased)
|
||||||
- Add "Frequently used" category to emoji picker
|
- Add "Frequently used" category to emoji picker
|
||||||
- Add CAS support (tduehr)
|
- Add CAS support (tduehr)
|
||||||
- Add link to merge request on build detail page.
|
- Add link to merge request on build detail page.
|
||||||
|
- Revert back upvote and downvote button to the issue and MR pages
|
||||||
|
|
||||||
v 8.3.2 (unreleased)
|
v 8.3.2 (unreleased)
|
||||||
- Enable "Add key" button when user fills in a proper key
|
- Enable "Add key" button when user fills in a proper key
|
||||||
|
|
|
@ -43,15 +43,19 @@ class @AwardsHandler
|
||||||
|
|
||||||
decrementCounter: (emoji) ->
|
decrementCounter: (emoji) ->
|
||||||
counter = @findEmojiIcon(emoji).siblings(".counter")
|
counter = @findEmojiIcon(emoji).siblings(".counter")
|
||||||
|
emojiIcon = counter.parent()
|
||||||
|
|
||||||
if parseInt(counter.text()) > 1
|
if parseInt(counter.text()) > 1
|
||||||
counter.text(parseInt(counter.text()) - 1)
|
counter.text(parseInt(counter.text()) - 1)
|
||||||
counter.parent().removeClass("active")
|
emojiIcon.removeClass("active")
|
||||||
@removeMeFromAuthorList(emoji)
|
@removeMeFromAuthorList(emoji)
|
||||||
|
else if emoji =="thumbsup" || emoji == "thumbsdown"
|
||||||
|
emojiIcon.tooltip("destroy")
|
||||||
|
counter.text(0)
|
||||||
|
emojiIcon.removeClass("active")
|
||||||
else
|
else
|
||||||
award = counter.parent()
|
emojiIcon.tooltip("destroy")
|
||||||
award.tooltip("destroy")
|
emojiIcon.remove()
|
||||||
award.remove()
|
|
||||||
|
|
||||||
removeMeFromAuthorList: (emoji) ->
|
removeMeFromAuthorList: (emoji) ->
|
||||||
award_block = @findEmojiIcon(emoji).parent()
|
award_block = @findEmojiIcon(emoji).parent()
|
||||||
|
@ -127,9 +131,6 @@ class @AwardsHandler
|
||||||
|
|
||||||
getFrequentlyUsedEmojis: ->
|
getFrequentlyUsedEmojis: ->
|
||||||
frequently_used_emojis = ($.cookie('frequently_used_emojis') || "").split(",")
|
frequently_used_emojis = ($.cookie('frequently_used_emojis') || "").split(",")
|
||||||
|
|
||||||
frequently_used_emojis = ["thumbsup", "thumbsdown"].concat(frequently_used_emojis)
|
|
||||||
|
|
||||||
_.compact(_.uniq(frequently_used_emojis))
|
_.compact(_.uniq(frequently_used_emojis))
|
||||||
|
|
||||||
renderFrequentlyUsedBlock: ->
|
renderFrequentlyUsedBlock: ->
|
||||||
|
|
|
@ -107,9 +107,16 @@ class Note < ActiveRecord::Base
|
||||||
end
|
end
|
||||||
|
|
||||||
def grouped_awards
|
def grouped_awards
|
||||||
|
notes = {}
|
||||||
|
|
||||||
awards.select(:note).distinct.map do |note|
|
awards.select(:note).distinct.map do |note|
|
||||||
[ note.note, where(note: note.note) ]
|
notes[note.note] = where(note: note.note)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
notes["thumbsup"] ||= Note.none
|
||||||
|
notes["thumbsdown"] ||= Note.none
|
||||||
|
|
||||||
|
notes
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -137,9 +137,14 @@ describe Note, models: true do
|
||||||
create :note, note: "smile", is_award: true
|
create :note, note: "smile", is_award: true
|
||||||
end
|
end
|
||||||
|
|
||||||
it "returns grouped array of notes" do
|
it "returns grouped hash of notes" do
|
||||||
expect(Note.grouped_awards.first.first).to eq("smile")
|
expect(Note.grouped_awards.keys.size).to eq(3)
|
||||||
expect(Note.grouped_awards.first.last).to match_array(Note.all)
|
expect(Note.grouped_awards["smile"]).to match_array(Note.all)
|
||||||
|
end
|
||||||
|
|
||||||
|
it "returns thumbsup and thumbsdown always" do
|
||||||
|
expect(Note.grouped_awards["thumbsup"]).to match_array(Note.none)
|
||||||
|
expect(Note.grouped_awards["thumbsdown"]).to match_array(Note.none)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue