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

Merge pull request #1848 from C-Otto/tracks-1847

Browse source 
Fix description of monthly recurring tests
This commit is contained in:
Matt Rogers 2015-08-07 20:29:40 -04:00
commit a9023960fc
3 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/helpers/application_helper.rb
View file

@ -107,13 +107,15 @@ module ApplicationHelper
end
def recurrence_pattern_as_text(recurring_todo)
rt = recurring_todo.recurring_target_as_text
rp = recurring_todo.recurrence_pattern
rp = " " + rp unless rp.nil?
rts = recurrence_time_span(recurring_todo)
# only add space if recurrence_time_span has content
rts = " " + rts unless rts == ""
return rt+rp+rts
recurring_target = recurring_todo.recurring_target_as_text
recurrence_pattern = recurring_todo.recurrence_pattern
recurrence_pattern = ' ' + recurrence_pattern unless recurrence_pattern.nil?
recurrence_time_span = recurrence_time_span(recurring_todo)
recurrence_time_span = ' ' + recurrence_time_span unless recurrence_time_span.empty?
recurring_target + recurrence_pattern + recurrence_time_span
end
def date_format_for_date_picker()