Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Show user what options they have voted (#11195)

Browse source 
* Add own_votes field to poll results in REST API

Fixes #10679

* Display user votes in WebUI

* Update styling

* Add vote checkmark to public pages
This commit is contained in:
ThibG 2019-09-22 14:15:18 +02:00 • committed by Eugen Rochko
parent 26b810561a
commit b359974d9b
6 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/serializers/rest/poll_serializer.rb
View file

@ -8,6 +8,7 @@ class REST::PollSerializer < ActiveModel::Serializer
has_many :emojis, serializer: REST::CustomEmojiSerializer
attribute :voted, if: :current_user?
attribute :own_votes, if: :current_user?
def id
object.id.to_s
@ -21,6 +22,10 @@ class REST::PollSerializer < ActiveModel::Serializer
object.voted?(current_user.account)
end
def own_votes
object.own_votes(current_user.account)
end
def current_user?
!current_user.nil?
end