gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Linter fixes (many unrelated)

Browse source
This commit is contained in:
James Mason 2018-02-23 00:41:19 -08:00
parent d40229a054
commit d040d9c6ab
No known key found for this signature in database
GPG key ID: 1B3951886C449023
20 changed files with 100 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/cfp.rb
View file

@ -42,7 +42,7 @@ class Cfp < ApplicationRecord
def weeks
result = end_week - start_week + 1
weeks = Date.new(start_date.year, 12, 31).strftime('%W').to_i
result < 0 ? result + weeks : result
result.negative? ? result + weeks : result
end
##
@ -63,7 +63,7 @@ class Cfp < ApplicationRecord
def remaining_days(date = Date.today)
result = (end_date - date).to_i
result > 0 ? result : 0
result.positive? ? result : 0
end
##
@ -106,12 +106,12 @@ class Cfp < ApplicationRecord
private
def before_end_of_conference
if program && program.conference && program.conference.end_date && end_date && (end_date > program.conference.end_date)
if program&.conference && program.conference.end_date && end_date && (end_date > program.conference.end_date)
errors
.add(:end_date, "can't be after the conference end date (#{program.conference.end_date})")
end
if program && program.conference && program.conference.end_date && start_date && (start_date > program.conference.end_date)
if program&.conference && program.conference.end_date && start_date && (start_date > program.conference.end_date)
errors
.add(:start_date, "can't be after the conference end date (#{program.conference.end_date})")
end