Merge pull request #1680 from consul/chore/small_rubocop_cleanup

Chore/small rubocop cleanup
This commit is contained in:
Raimond Garcia
2017-06-26 17:42:10 +02:00
committed by GitHub
31 changed files with 60 additions and 103 deletions

View File

@@ -67,6 +67,7 @@ class Admin::Poll::PollsController < Admin::BaseController
end
private
def load_geozones
@geozones = Geozone.all.order(:name)
end

View File

@@ -26,6 +26,7 @@ class Legislation::AnswersController < Legislation::BaseController
end
private
def answer_params
params.require(:legislation_answer).permit(
:legislation_question_option_id,

View File

@@ -28,6 +28,7 @@ class Officing::FinalRecountsController < Officing::BaseController
end
private
def load_poll
@poll = Poll.expired.find(params[:poll_id])
end

View File

@@ -27,6 +27,7 @@ class Officing::RecountsController < Officing::BaseController
end
private
def load_poll
@poll = Poll.find(params[:poll_id])
end

View File

@@ -30,7 +30,7 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
identity = Identity.first_or_create_from_oauth(auth)
@user = current_user || identity.user || User.first_or_initialize_for_oauth(auth)
if save_user(@user)
if save_user
identity.update(user: @user)
sign_in_and_redirect @user, event: :authentication
set_flash_message(:notice, :success, kind: "#{provider}".capitalize) if is_navigational_format?
@@ -40,8 +40,8 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
end
end
def save_user(user)
def save_user
@user.save || @user.save_requiring_finish_signup
end
end
end

View File

@@ -10,6 +10,7 @@ class UsersController < ApplicationController
end
private
def set_activity_counts
@activity_counts = HashWithIndifferentAccess.new(
proposals: Proposal.where(author_id: @user.id).count,