From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 9 Mar 2008 12:15:27 +0000 (+0000)
Subject: Show replies as well when choosing to display messages in the activity.
X-Git-Tag: 0.7.0-RC1~80
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0ec13848b0ca16291ddd9c2959efca2241456b0a;p=redmine.git

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
---

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)