Check category for custom fields

This commit is contained in:
Joe Buhlig 2016-03-18 09:29:05 -05:00
parent da948d9855
commit 3543ec9330
3 changed files with 21 additions and 4 deletions

View File

@ -2,7 +2,11 @@
<div class="voting title-voting">
<div class="voting-wrapper">
{{#if siteSettings.feature_voting_show_who_voted}}
<a href {{action "showWhoVoted"}} class="vote-count">{{model.vote_count}}</a>
{{#if model.has_votes}}
<a href {{action "showWhoVoted"}} class="vote-count">{{model.vote_count}}</a>
{{else}}
<div class="vote-count">{{model.vote_count}}</div>
{{/if}}
{{else}}
<div class="vote-count">{{model.vote_count}}</div>
{{/if}}

View File

@ -70,7 +70,12 @@ function startVoting(api){
getWhoVoted() {
const { attrs, state } = this;
var users = attrs.who_voted;
return state.whoVotedUsers = users.map(whoVotedAvatars);
if (users.length){
return state.whoVotedUsers = users.map(whoVotedAvatars);
}
else{
return state.whoVotedUsers = [];
}
}
});
}

View File

@ -16,10 +16,10 @@ after_initialize do
require_dependency 'topic_view_serializer'
class ::TopicViewSerializer
attributes :can_vote, :single_vote, :vote_count, :user_voted, :who_voted
attributes :can_vote, :single_vote, :vote_count, :has_votes, :user_voted, :who_voted
def can_vote
return object.topic.category.custom_fields["enable_topic_voting"]
return object.topic.category.respond_to?(:custom_fields) ? !!object.topic.category.custom_fields["enable_topic_voting"] : false
end
def single_vote
@ -34,6 +34,14 @@ after_initialize do
object.topic.vote_count
end
def has_votes
if object.topic.vote_count.to_i > 0
return true
else
return false
end
end
def user_voted
user = scope.user
if user && user.custom_fields["votes"]