{{#if showingResults}}
{{#if isNumber}}
- {{poll-results-number poll=poll pollsVoters=pollsVoters}}
+ {{poll-results-number poll=poll}}
{{else}}
- {{poll-results-standard poll=poll pollsVoters=pollsVoters}}
+ {{poll-results-standard poll=poll}}
{{/if}}
{{else}}
diff --git a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
index 0b7919258bf..d0993720922 100644
--- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
@@ -29,10 +29,6 @@ function initializePolls(api) {
const post = this.get('model.postStream').findLoadedPost(msg.post_id);
if (post) {
post.set('polls', msg.polls);
-
- if (msg.user) {
- post.set(`polls_voters.${msg.user.id}`, msg.user);
- }
}
});
},
@@ -80,7 +76,6 @@ function initializePolls(api) {
const post = helper.getModel();
api.preventCloak(post.id);
const votes = post.get('polls_votes') || {};
- post.set("polls_voters", (post.get("polls_voters") || {}));
post.pollsChanged();
diff --git a/plugins/poll/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss
index 5db25555550..1d25e2d5743 100644
--- a/plugins/poll/assets/stylesheets/common/poll.scss
+++ b/plugins/poll/assets/stylesheets/common/poll.scss
@@ -81,7 +81,7 @@ div.poll {
vertical-align: middle;
padding: 10px;
- & > span {
+ .poll-results-number-rating {
font-size: 2em;
}
}
@@ -97,10 +97,11 @@ div.poll {
display: inline;
}
- margin: 5px 0;
+ margin-top: 10px;
}
.poll-voters-toggle-expand {
+ width: 100%;
text-align: center;
}
diff --git a/plugins/poll/config/locales/client.en.yml b/plugins/poll/config/locales/client.en.yml
index 9cad3df38dc..4344b85bd13 100644
--- a/plugins/poll/config/locales/client.en.yml
+++ b/plugins/poll/config/locales/client.en.yml
@@ -67,3 +67,4 @@ en:
error_while_toggling_status: "There was an error while toggling the status of this poll."
error_while_casting_votes: "There was an error while casting your votes."
+ error_while_fetching_voters: "There was an error while displaying the voters."
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index 26b825dac6e..075be098317 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -185,7 +185,7 @@ after_initialize do
class DiscoursePoll::PollsController < ::ApplicationController
requires_plugin PLUGIN_NAME
- before_filter :ensure_logged_in
+ before_filter :ensure_logged_in, except: [:voters]
def vote
post_id = params.require(:post_id)
@@ -214,11 +214,22 @@ after_initialize do
render_json_error e.message
end
end
+
+ def voters
+ user_ids = params.require(:user_ids)
+
+ users = User.where(id: user_ids).map do |user|
+ UserNameSerializer.new(user).serializable_hash
+ end
+
+ render json: { users: users }
+ end
end
DiscoursePoll::Engine.routes.draw do
put "/vote" => "polls#vote"
put "/toggle_status" => "polls#toggle_status"
+ get "/voters" => 'polls#voters'
end
Discourse::Application.routes.append do
@@ -299,26 +310,4 @@ after_initialize do
return unless post_custom_fields[DiscoursePoll::VOTES_CUSTOM_FIELD].present?
post_custom_fields[DiscoursePoll::VOTES_CUSTOM_FIELD].has_key?("#{scope.user.id}")
end
-
- add_to_serializer(:post, :polls_voters) do
- voters = {}
-
- user_ids = post_custom_fields[DiscoursePoll::VOTES_CUSTOM_FIELD].keys
-
- User.where(id: user_ids).map do |user|
- voters[user.id] = UserNameSerializer.new(user).serializable_hash
- end
-
- voters
- end
-
- add_to_serializer(:post, :include_polls_voters?) do
- return unless post_custom_fields.present?
- return unless post_custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD].present?
- return unless post_custom_fields[DiscoursePoll::VOTES_CUSTOM_FIELD].present?
-
- post_custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD].any? do |_, value|
- value["public"] == "true"
- end
- end
end
diff --git a/plugins/poll/spec/controllers/polls_controller_spec.rb b/plugins/poll/spec/controllers/polls_controller_spec.rb
index 8dc6a66cfa6..9e8e0196443 100644
--- a/plugins/poll/spec/controllers/polls_controller_spec.rb
+++ b/plugins/poll/spec/controllers/polls_controller_spec.rb
@@ -173,5 +173,4 @@ describe ::DiscoursePoll::PollsController do
end
end
-
end
diff --git a/plugins/poll/spec/integration/poll_endpoints_spec.rb b/plugins/poll/spec/integration/poll_endpoints_spec.rb
new file mode 100644
index 00000000000..6aeb65cd300
--- /dev/null
+++ b/plugins/poll/spec/integration/poll_endpoints_spec.rb
@@ -0,0 +1,18 @@
+require "rails_helper"
+
+describe "DiscoursePoll endpoints" do
+ describe "fetch voters from user_ids" do
+ let(:user) { Fabricate(:user) }
+
+ it "should return the right response" do
+ get "/polls/voters.json", { user_ids: [user.id] }
+
+ expect(response.status).to eq(200)
+
+ json = JSON.parse(response.body)["users"].first
+
+ expect(json["name"]).to eq(user.name)
+ expect(json["title"]).to eq(user.title)
+ end
+ end
+end