github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-23 08:25:43 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: properly disable serializable attributes when poll plugin is disabled

Browse Source
This commit is contained in:
Régis Hanol 2018-11-20 17:28:41 +01:00
parent 22a7f1e7f2
commit 92100f82eb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/poll/plugin.rb
View File

@ -474,7 +474,7 @@ after_initialize do
end end
add_to_serializer(:post, :include_polls?) do add_to_serializer(:post, :include_polls?) do
preloaded_polls.present? SiteSetting.poll_enabled && preloaded_polls.present?
end end
add_to_serializer(:post, :polls_votes, false) do add_to_serializer(:post, :polls_votes, false) do
@ -490,6 +490,7 @@ after_initialize do
end end
add_to_serializer(:post, :include_polls_votes?) do add_to_serializer(:post, :include_polls_votes?) do
SiteSetting.poll_enabled &&
scope.user&.id.present? && scope.user&.id.present? &&
preloaded_polls.present? && preloaded_polls.present? &&
preloaded_polls.any? { |p| p.has_voted?(scope.user) } preloaded_polls.any? { |p| p.has_voted?(scope.user) }