Show replies as well when choosing to display messages in the activity.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1217 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
a92cce3851
commit
0ec13848b0
|
@ -278,7 +278,7 @@ class ProjectsController < ApplicationController
|
||||||
if @scope.include?('messages')
|
if @scope.include?('messages')
|
||||||
@events += Message.find(:all,
|
@events += Message.find(:all,
|
||||||
:include => [:board, :author],
|
:include => [:board, :author],
|
||||||
:conditions => ["#{Board.table_name}.project_id=? AND #{Message.table_name}.parent_id IS NULL AND #{Message.table_name}.created_on BETWEEN ? AND ?", @project.id, @date_from, @date_to])
|
:conditions => ["#{Board.table_name}.project_id=? AND #{Message.table_name}.created_on BETWEEN ? AND ?", @project.id, @date_from, @date_to])
|
||||||
end
|
end
|
||||||
|
|
||||||
@events_by_day = @events.group_by(&:event_date)
|
@events_by_day = @events.group_by(&:event_date)
|
||||||
|
|
Loading…
Reference in New Issue