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

Rename RecurringTodo#has_next_todo to continues_recurring?

Browse source 
This clarifies the intent of the method.
This commit is contained in:
Matt Rogers 2013-04-26 16:30:12 -05:00
parent 036c34f266
commit 88e7798db6
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/todos_controller.rb
View file

@ -1142,7 +1142,7 @@ class TodosController < ApplicationController
# if both due and show_from are nil, check for a next todo from now
date_to_check = Time.zone.now if date_to_check.nil?
if recurring_todo.active? && recurring_todo.has_next_todo(date_to_check)
if recurring_todo.active? && recurring_todo.continues_recurring?(date_to_check)
# shift the reference date to yesterday if date_to_check is furher in
# the past. This is to make sure we do not get older todos for overdue

4
app/models/recurring_todo.rb
View file

@ -658,7 +658,7 @@ class RecurringTodo < ActiveRecord::Base
return nil
end
def has_next_todo(previous)
def continues_recurring?(previous)
return self.occurences_count < self.number_of_occurences unless self.number_of_occurences.nil?
return true if self.end_date.nil? || self.ends_on == 'no_end_date'
@ -673,7 +673,7 @@ class RecurringTodo < ActiveRecord::Base
end
def done?(end_date)
!has_next_todo(end_date)
!continues_recurring?(end_date)
end
def toggle_completion!