Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-05 15:31:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix syntax errors for upgrade of Rails version

Browse source
This commit is contained in:
Jyri-Petteri Paloposki 2022-01-04 01:18:13 +02:00
parent 7f567862d7
commit 86e36b07a6
9 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/recurring_todos/abstract_recurrence_pattern.rb
View file

@ -80,11 +80,11 @@ module RecurringTodos
end
def validate_not_blank(object, msg)
errors[:base] << msg if object.blank?
errors.add(:base, msg) if object.blank?
end
def validate_not_nil(object, msg)
errors[:base] << msg if object.nil?
errors.add(:base, msg) if object.nil?
end
def validate
@ -100,7 +100,7 @@ module RecurringTodos
when "ends_on_end_date"
validate_not_blank(end_date, "The end date needs to be filled in for 'Ends on'")
else
errors[:base] << "The end of the recurrence is not selected" unless ends_on == "no_end_date"
errors.add(:base, "The end of the recurrence is not selected") unless ends_on == "no_end_date"
end
end
@ -113,7 +113,7 @@ module RecurringTodos
validate_not_nil(show_always?, "Please select when to show the action")
validate_not_blank(show_from_delta, "Please fill in the number of days to show the todo before the due date") unless show_always?
else
errors[:base] << "Unexpected value of recurrence target selector '#{target}'"
errors.add(:base, "Unexpected value of recurrence target selector '#{target}'")
end
end

2
app/models/recurring_todos/daily_recurrence_pattern.rb
View file

@ -24,7 +24,7 @@ module RecurringTodos
def validate
super
errors[:base] << "Every other nth day may not be empty for this daily recurrence setting" if (!only_work_days?) && every_x_days.blank?
errors.add(:base, "Every other nth day may not be empty for this daily recurrence setting") if (!only_work_days?) && every_x_days.blank?
end
def get_next_date(previous)

2
app/models/recurring_todos/weekly_recurrence_pattern.rb
View file

@ -30,7 +30,7 @@ module RecurringTodos
super
validate_not_blank(every_x_week, "Every other nth week may not be empty for weekly recurrence setting")
something_set = %w{ sunday monday tuesday wednesday thursday friday saturday }.inject(false) { |set, day| set || send("on_#{day}") }
errors[:base] << "You must specify at least one day on which the todo recurs" unless something_set
errors.add(:base, "You must specify at least one day on which the todo recurs") unless something_set
end
def get_next_date(previous)