Changeset 5822

Show
Ignore:
Timestamp:
06/30/08 09:01:57 (2 months ago)
Author:
uta
Message:

2008/06/30 sync

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • components/todo_list/trunk/todo_list/component_plugins/calendar/lib/todo_list_adapter.rb

    r5795 r5822  
    55      filter_conditions = TodoList::TodoListTodo.filter_merge_conditions({:start_on => range.first.strftime(RubricksLib.hl('[_Common_Date_Format]')), :close_on => range.last.strftime(RubricksLib.hl('[_Common_Date_Format]'))}) 
    66      tlt_list          = TodoList::TodoListTodo.find(:all, :conditions => filter_conditions[:conditions], :include => :todo_list_category_boxes, :order => 'todo_list_todos.id desc') 
    7       return tlt_list.map {|tlt| tlt.to_schedule} 
     7      return tlt_list.map{|tlt| tlt.to_schedule}.compact 
    88    end 
    99 

  • components/todo_list/trunk/todo_list/todo_list_todo.rb

    r5795 r5822  
    257257 
    258258  def to_schedule 
    259     range = self.close_on.to_date.to_range 
    260     return RubricksSchedule.new({:id => self.id, :start => range.first, :finish => range.last, :description => self.title, :publicity => true, :callback => %Q|rubricks.todo_list.common_input_window_render(#{self.id}, '/todo_list/block', 'update');|, :icon => todo_icon, :icon_for_list => todo_icon, :removable => false}) 
     259    close_on = self.close_on 
     260    if close_on.blank? 
     261      return nil 
     262    else 
     263      range = self.close_on.to_date.to_range 
     264      return RubricksSchedule.new({:id => self.id, :start => range.first, :finish => range.last, :description => RubricksLib.hl(self.title), :publicity => true, :callback => %Q|rubricks.todo_list.common_input_window_render(#{self.id}, '/todo_list/block', 'update');|, :icon => todo_icon, :icon_for_list => todo_icon, :removable => false}) 
     265    end 
    261266  end 
    262267