calendar-block was also broken.

pull/6827/head
Stefan Frank 11 years ago
parent 3e089276fb
commit 1a379d1dfb
  1. 6
      app/views/my_projects_overviews/blocks/_calendar.html.erb

@ -13,8 +13,8 @@ See doc/COPYRIGHT.rdoc for more details.
<h3><%= l(:label_calendar) %></h3>
<% 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 } %>

Loading…
Cancel
Save