consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix hound warnings

Browse Source
This commit is contained in:
decabeza
2019-03-26 18:21:19 +01:00
parent eda6ea7f12
commit f47ec9d7dc
12 changed files with 203 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/management/proposals_controller.rb
View File

@@ -8,11 +8,12 @@ class Management::ProposalsController < Management::BaseController
before_action :load_categories, only: [:new, :edit]
before_action :load_geozones, only: [:edit]
has_orders %w{confidence_score hot_score created_at most_commented random}, only: [:index, :print]
has_orders %w{most_voted newest}, only: :show
has_orders %w[confidence_score hot_score created_at most_commented random], only: [:index, :print]
has_orders %w[most_voted newest], only: :show
def create
@resource = resource_model.new(strong_params.merge(author: current_user, published_at: Time.now))
@resource = resource_model.new(strong_params.merge(author: current_user,
published_at: Time.now))
if @resource.save
track_event
@@ -51,8 +52,9 @@ class Management::ProposalsController < Management::BaseController
end
def proposal_params
params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url,
:responsible_name, :tag_list, :terms_of_service, :geozone_id, :skip_map,
params.require(:proposal).permit(:title, :question, :summary, :description, :external_url,
:video_url, :responsible_name, :tag_list, :terms_of_service,
:geozone_id, :skip_map,
map_location_attributes: [:latitude, :longitude, :zoom])
end

8
app/controllers/polls_controller.rb
View File

@@ -6,18 +6,20 @@ class PollsController < ApplicationController
load_and_authorize_resource
has_filters %w[current expired]
has_orders %w{most_voted newest oldest}, only: :show
has_orders %w[most_voted newest oldest], only: :show
::Poll::Answer # trigger autoload
def index
@polls = @polls.public_polls.send(@current_filter).includes(:geozones).sort_for_list.page(params[:page])
@polls = @polls.public_polls.send(@current_filter).includes(:geozones)
.sort_for_list.page(params[:page])
end
def show
@questions = @poll.questions.for_render.sort_for_list
@token = poll_voter_token(@poll, current_user)
@poll_questions_answers = Poll::Question::Answer.where(question: @poll.questions).where.not(description: "").order(:given_order)
@poll_questions_answers = Poll::Question::Answer.where(question: @poll.questions)
.where.not(description: "").order(:given_order)
@answers_by_question_id = {}
poll_answers = ::Poll::Answer.by_question(@poll.question_ids).by_author(current_user.try(:id))