diff --git a/app/views/my_projects_overviews/blocks/_calendar.html.erb b/app/views/my_projects_overviews/blocks/_calendar.html.erb index 9643a68164..42a0754a23 100644 --- a/app/views/my_projects_overviews/blocks/_calendar.html.erb +++ b/app/views/my_projects_overviews/blocks/_calendar.html.erb @@ -13,8 +13,8 @@ See doc/COPYRIGHT.rdoc for more details.

<%= l(:label_calendar) %>

<% calendar = Redmine::Helpers::Calendar.new(Date.today, current_language, :week) - calendar.events = Issue.visible.find :all, - :conditions => ["#{Issue.table_name}.project_id in (#{@user.projects.collect{|m| m.id}.join(',')}) AND ((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", calendar.startdt, calendar.enddt, calendar.startdt, calendar.enddt], - :include => [:project, :type, :priority, :assigned_to] unless @user.projects.empty? %> + calendar.events = WorkPackage.visible.find :all, + :conditions => ["#{WorkPackage.table_name}.project_id in (#{@user.projects.collect{|m| m.id}.join(',')}) AND ((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", calendar.startdt, calendar.enddt, calendar.startdt, calendar.enddt], + :include => [:project, :type, :priority, :assigned_to] unless @user.projects.empty? %> <%= render :partial => 'common/calendar', :locals => {:calendar => calendar } %>