Merge remote-tracking branch 'consul/master' into iagirre-admin-poll-stats

app/controllers/admin/poll/polls_controller.rb

@@ -58,9 +58,10 @@ class Admin::Poll::PollsController < Admin::Poll::BaseController
     end
 
     def poll_params
-      params.require(:poll).permit(:name, :starts_at, :ends_at, :geozone_restricted, :summary, :description,
-                                   geozone_ids: [],
-                                   image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy])
+      params.require(:poll).permit(:name, :starts_at, :ends_at, :geozone_restricted,
+                                  :summary, :description, :results_enabled, :stats_enabled,
+                                  geozone_ids: [],
+                                  image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy])
     end
 
     def search_params

app/controllers/admin/poll/shifts_controller.rb

@@ -6,6 +6,8 @@ class Admin::Poll::ShiftsController < Admin::Poll::BaseController
   def new
     load_shifts
     @shift = ::Poll::Shift.new
+    @voting_polls = @booth.polls.current_or_incoming
+    @recount_polls = @booth.polls.current_or_recounting_or_incoming
   end
 
   def create

app/controllers/polls/questions_controller.rb

@@ -13,6 +13,9 @@ class Polls::QuestionsController < ApplicationController
     answer.touch if answer.persisted?
     answer.save!
     answer.record_voter_participation(token)
+    @question.question_answers.where(question_id: @question).each do |answer|
+      answer.set_most_voted
+    end
 
     @answers_by_question_id = { @question.id => params[:answer] }
   end

app/controllers/polls_controller.rb

@@ -25,8 +25,13 @@ class PollsController < ApplicationController
 
     @commentable = @poll
     @comment_tree = CommentTree.new(@commentable, params[:page], @current_order)
-    
+  end
+
+  def stats
     @stats = Poll::Stats.new(@poll).generate
   end
 
+  def results
+  end
+
 end