Add who voted to vote count

Author: joebuhlig

Diff for: LICENSE.txt

@@ -1,7 +1,11 @@
 {{#if model.can_vote}}
 <div class="voting title-voting">
 	<div class="voting-wrapper">
-		<div class="vote-count">{{model.vote_count}}</div>
+		{{#if siteSettings.feature_voting_show_who_voted}}
+			<a href {{action "showWhoVoted"}} class="vote-count">{{model.vote_count}}</a>
+		{{else}}
+			<div class="vote-count">{{model.vote_count}}</div>
+		{{/if}}
 		<div class="vote-label">
 			{{#if model.single_vote}}
 				{{i18n 'feature_voting.vote.one'}}
@@ -25,5 +29,10 @@
 			{{/if}}
 		{{/if}}
 	{{/if}}
+	{{#if siteSettings.feature_voting_show_who_voted}}
+		{{#popup-menu visible=whoVotedVisible hide="hideWhoVoted" title="feature_voting.vote_title_plural" extraClasses="who-voted-popup-menu"}}
+			<li>{{mount-widget widget="who-voted" args=model}}</li>
+		{{/popup-menu}}
+	{{/if}}
 </div>
 {{/if}}

Diff for: assets/javascripts/discourse/templates/connectors/topic-above-post-stream/topic-title-voting.hbs

@@ -1,5 +1,7 @@
 import { withPluginApi } from 'discourse/lib/plugin-api';
 import TopicRoute from 'discourse/routes/topic';
+import TopicController from 'discourse/controllers/topic';
+import { createWidget } from 'discourse/widgets/widget';
 
 function  startVoting(api){
   TopicRoute.reopen({
@@ -39,6 +41,45 @@ function  startVoting(api){
       }
     }
   })
+
+  TopicController.reopen({
+    actions: {
+      showWhoVoted() {
+        this.set('whoVotedVisible', true);
+      },
+
+      hideWhoVoted() {
+        this.set('whoVotedVisible', false);
+      }
+    }
+  })
+
+  createWidget('who-voted', {
+    tagName: 'div.who-voted',
+
+    html(attrs, state) {
+      const contents = this.attach('small-user-list', {
+        users: this.getWhoVoted(),
+        addSelf: attrs.liked,
+        listClassName: 'who-voted',
+        description: 'feature_voting.who_voted'
+      })
+      return contents;
+    },
+
+    getWhoVoted() {
+      const { attrs, state } = this;
+      var users = attrs.who_voted;
+      return state.whoVotedUsers = users.map(whoVotedAvatars);
+    }
+  });
+}
+
+function whoVotedAvatars(user) {
+  return { template: user.user.avatar_template,
+           username: user.user.username,
+           post_url: user.user.post_url,
+           url: Discourse.getURL('/users/') + user.user.username_lower };
 }
 
 export default {

Diff for: assets/javascripts/initializers/feature-voting.js.es6

@@ -22,6 +22,7 @@
 }
 .title-voting{
 	padding-top:14px;
+    position: relative;
 }
 .vote-button{
 	background-color: $tertiary;
@@ -48,4 +49,19 @@
         line-height: 20px;
         cursor: pointer;
     }
+}
+.who-voted-popup-menu {
+    position: absolute !important;
+    left: 90px !important;
+    top: 45px !important;
+
+    h3 {
+        display: none;
+    }
+    ul{
+        margin: 0px;
+    }
+}
+.who-voted .trigger-user-card img {
+    margin: 2px 0px;
 }

Diff for: assets/stylesheets/feature-voting.scss

@@ -9,4 +9,5 @@ en:
       voting_limit: "Limit"
       vote:
         one: "vote"
-        multiple: "votes"
+        multiple: "votes"
+      who_voted: "voted for this"

Diff for: config/locales/client.en.yml

@@ -1,4 +1,5 @@
 en:
   site_settings: 
     feature_voting_enabled: 'Allow users to vote on topics?'
-    feature_voting_vote_limit: 'How many active votes are users allowed?'
+    feature_voting_vote_limit: 'How many active votes are users allowed?'
+    feature_voting_show_who_voted: 'Allow users to see who voted?'

Diff for: config/locales/server.en.yml

@@ -4,4 +4,7 @@ plugins:
     client: true
   feature_voting_vote_limit:
     default: 10
+    client: true
+  feature_voting_show_who_voted:
+    default: true
     client: true

Diff for: config/settings.yml

@@ -16,7 +16,7 @@
 
   require_dependency 'topic_view_serializer'
   class ::TopicViewSerializer
-    attributes :can_vote, :single_vote, :vote_count, :user_voted
+    attributes :can_vote, :single_vote, :vote_count, :user_voted, :who_voted
 
     def can_vote
       return object.topic.category.custom_fields["enable_topic_voting"]
@@ -43,6 +43,14 @@ def user_voted
         return false
       end
     end
+
+    def who_voted
+      users = []
+      User.where(id: object.topic.who_voted).each do |user|
+        users.push(UserSerializer.new(user, scope: scope, root: 'user'))
+      end
+      return users
+    end
   end
 
   add_to_serializer(:topic_list_item, :vote_count) { object.vote_count }
@@ -142,6 +150,11 @@ def vote_count
       end
     end
 
+    def who_voted
+      user_ids = UserCustomField.where(name: "votes", value: self.id).pluck(:user_id)
+      return user_ids
+    end
+
   end
 
   require_dependency 'list_controller'