diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index c94810aa8..a47126052 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -559,7 +559,7 @@ class ProjectsController < ApplicationController @events = [] @project.issues_with_subprojects(params[:with_subprojects]) do @events += Issue.find(:all, - :include => [:tracker, :status, :assigned_to, :priority], + :include => [:tracker, :status, :assigned_to, :priority, :project], :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)) and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", @date_from, @date_to, @date_from, @date_to] ) unless @selected_tracker_ids.empty? end @@ -597,7 +597,7 @@ class ProjectsController < ApplicationController @project.issues_with_subprojects(params[:with_subprojects]) do @events += Issue.find(:all, :order => "start_date, due_date", - :include => [:tracker, :status, :assigned_to, :priority], + :include => [:tracker, :status, :assigned_to, :priority, :project], :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date and due_date>?)) and start_date is not null and due_date is not null and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to] ) unless @selected_tracker_ids.empty? end diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml index 4f4b5ab71..c63365b6c 100644 --- a/app/views/projects/calendar.rhtml +++ b/app/views/projects/calendar.rhtml @@ -67,7 +67,7 @@ while day <= @date_to elsif day == i.due_date image_tag('arrow_to.png') end %> - <%= link_to_issue i %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %> + <%= link_to_issue i %><%= " (#{i.project.name})" unless @project && @project == i.project %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %> <%= render :partial => "issues/tooltip", :locals => { :issue => i }%> diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml index c8490fd1a..1b51b4a6e 100644 --- a/app/views/projects/gantt.rhtml +++ b/app/views/projects/gantt.rhtml @@ -86,7 +86,7 @@ top = headers_height + 8 @events.each do |i| %>