##// END OF EJS Templates
Merged r3351 from trunk....
Jean-Philippe Lang -
r3238:27fa40d2830f
parent child
Show More
@@ -1,7 +1,7
1 <h3><%= l(:label_calendar) %></h3>
1 <h3><%= l(:label_calendar) %></h3>
2
2
3 <% calendar = Redmine::Helpers::Calendar.new(Date.today, current_language, :week)
3 <% calendar = Redmine::Helpers::Calendar.new(Date.today, current_language, :week)
4 calendar.events = Issue.find :all,
4 calendar.events = Issue.visible.find :all,
5 :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],
5 :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],
6 :include => [:project, :tracker, :priority, :assigned_to] unless @user.projects.empty? %>
6 :include => [:project, :tracker, :priority, :assigned_to] unless @user.projects.empty? %>
7
7
General Comments 0
You need to be logged in to leave comments. Login now