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

Merge pull request #1894 from consul/chore/rubocop

Browse Source 
🤖  Rubocop fixes and config
This commit is contained in:
BertoCQ
2017-09-25 19:12:06 +02:00
committed by GitHub
parent 0eb33bbcd4 6aba5de801
commit aafd82542e
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/officing/polls_controller.rb
View File

@@ -7,7 +7,7 @@ class Officing::PollsController < Officing::BaseController
def final
@polls = if current_user.poll_officer?
current_user.poll_officer.final_days_assigned_polls.select {|poll| poll.ends_at > 2.week.ago && poll.expired?}
current_user.poll_officer.final_days_assigned_polls.select {|poll| poll.ends_at > 2.weeks.ago && poll.expired?}
else
[]
end

4
app/helpers/admin_helper.rb
View File

@@ -25,7 +25,7 @@ module AdminHelper
end
def menu_polls?
["polls", "questions", "officers", "booths", "officer_assignments", "booth_assignments", "recounts", "results", "shifts"].include? controller_name
%w[polls questions officers booths officer_assignments booth_assignments recounts results shifts].include? controller_name
end
def menu_profiles?
@@ -39,7 +39,7 @@ module AdminHelper
def menu_customization?
["pages", "images", "content_blocks"].include? controller_name
end
def official_level_options
options = [["", 0]]
(1..5).each do |i|