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

Merge branch 'master' of git@github.com:bsag/tracks

Browse source
This commit is contained in:
Reinier Balt 2008-10-14 10:57:57 +02:00
commit 1a2cdc7585
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/todos_helper.rb
View file

@ -281,7 +281,7 @@ module TodosHelper
end
def defer_link(days)
link_to_remote image_tag("defer_#{days}.png"), :url => {:controller => 'todos', :action => 'defer', :id => @todo.id, :days => days, :_source_view => (@source_view.underscore.gsub(/\s+/,'_') rescue "")}
link_to_remote image_tag("defer_#{days}.png", :alt => "Defer #{pluralize(days, 'day')}"), :url => {:controller => 'todos', :action => 'defer', :id => @todo.id, :days => days, :_source_view => (@source_view.underscore.gsub(/\s+/,'_') rescue "")}
end
end

20
db/migrate/042_change_dates_to_datetimes.rb
View file

@ -6,14 +6,26 @@ class ChangeDatesToDatetimes < ActiveRecord::Migration
change_column :recurring_todos, :end_date, :datetime
User.all(:include => [:todos, :recurring_todos]).each do |user|
if !user.prefs ## ugly hack for strange edge-case of not having preferences object
user.instance_eval do
def at_midnight(date)
return Time.zone.local(date.year, date.month, date.day, 0, 0, 0)
end
def time
Time.zone.now
end
end
end
user.todos.each do |todo|
todo.update_attribute(:show_from, user.at_midnight(todo.show_from)) unless todo.show_from.nil?
todo.update_attribute(:due, user.at_midnight(todo.due)) unless todo.due.nil?
todo[:show_from] = user.at_midnight(todo.show_from) unless todo.show_from.nil?
todo[:due] = user.at_midnight(todo.due) unless todo.due.nil?
todo.save_with_validation(false)
end
user.recurring_todos.each do |todo|
todo.update_attribute(:start_from, user.at_midnight(todo.start_from)) unless todo.start_from.nil?
todo.update_attribute(:end_date, user.at_midnight(todo.end_date)) unless todo.end_date.nil?
todo[:start_from] = user.at_midnight(todo.start_from) unless todo.start_from.nil?
todo[:end_date] = user.at_midnight(todo.end_date) unless todo.end_date.nil?
todo.save_with_validation(false)
end
end
end