summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-03-09 12:15:27 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-03-09 12:15:27 +0000
commit0ec13848b0ca16291ddd9c2959efca2241456b0a (patch)
tree6d7ddb8e01bd58cb01bc1bb88fded446ab581239
parenta92cce385105d0f40d9bd80c73578ade42958ee3 (diff)
downloadredmine-0ec13848b0ca16291ddd9c2959efca2241456b0a.tar.gz
redmine-0ec13848b0ca16291ddd9c2959efca2241456b0a.zip
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
-rw-r--r--app/controllers/projects_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index af5960399..7e4cc81f3 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -278,7 +278,7 @@ class ProjectsController < ApplicationController
if @scope.include?('messages')
@events += Message.find(:all,
: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
@events_by_day = @events.group_by(&:event_date)