IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-01 04:59:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary for loop.

Browse Source
This commit is contained in:
Guo Xiang Tan 2016-06-07 16:49:22 +08:00
parent 02e461de8d
commit 5f92de8ede
No known key found for this signature in database
GPG Key ID: 19C321C8952B0F72
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/poll/lib/polls_updater.rb
View File

@ -7,11 +7,11 @@ module DiscoursePoll
previous_polls = post.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD] || {} previous_polls = post.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD] || {}
# extract options # extract options
current_options = extract_option_ids(polls) current_option_ids = extract_option_ids(polls)
previous_options = extract_option_ids(previous_polls) previous_option_ids = extract_option_ids(previous_polls)
# are the polls different? # are the polls different?
if polls_updated?(polls, previous_polls) || (current_options != previous_options) if polls_updated?(polls, previous_polls) || (current_option_ids != previous_option_ids)
has_votes = total_votes(previous_polls) > 0 has_votes = total_votes(previous_polls) > 0
# outside of the 5-minute edit window? # outside of the 5-minute edit window?
@ -52,12 +52,12 @@ module DiscoursePoll
polls[poll_name]["voters"] = previous_polls[poll_name]["voters"] polls[poll_name]["voters"] = previous_polls[poll_name]["voters"]
polls[poll_name]["anonymous_voters"] = previous_polls[poll_name]["anonymous_voters"] if previous_polls[poll_name].has_key?("anonymous_voters") polls[poll_name]["anonymous_voters"] = previous_polls[poll_name]["anonymous_voters"] if previous_polls[poll_name].has_key?("anonymous_voters")
for o in 0...polls[poll_name]["options"].size previous_options = previous_polls[poll_name]["options"]
current_option = polls[poll_name]["options"][o]
previous_option = previous_polls[poll_name]["options"][o]
current_option["votes"] = previous_option["votes"] polls[poll_name]["options"].each_with_index do |option, index|
current_option["anonymous_votes"] = previous_option["anonymous_votes"] if previous_option.has_key?("anonymous_votes") previous_option = previous_options[index]
option["votes"] = previous_option["votes"]
option["anonymous_votes"] = previous_option["anonymous_votes"] if previous_option.has_key?("anonymous_votes")
end end
end end