diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-06-21 12:32:47 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-06-21 12:32:47 +0000 |
| commit | bb1edda6e803c6a91fbcb7941fd619eb55be8d32 (patch) | |
| tree | 0b888b4219505b54c9c01d181dc6f11ed945ff3a /app/controllers | |
| parent | ba8a36a39b0aeafd45aeff2a71d5cf689cabaea1 (diff) | |
| download | redmine-bb1edda6e803c6a91fbcb7941fd619eb55be8d32.tar.gz redmine-bb1edda6e803c6a91fbcb7941fd619eb55be8d32.zip | |
Display issue notes in the activity view (#1509).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1567 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d15c6bc2a..c9a55088b 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -258,7 +258,8 @@ class ProjectsController < ApplicationController @events += Issue.find(:all, :include => [:project, :author, :tracker], :conditions => cond.conditions) cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_issues, :project => @project, :with_subprojects => @with_subprojects)) - cond.add(["#{Journal.table_name}.journalized_type = 'Issue' AND #{JournalDetail.table_name}.prop_key = 'status_id' AND #{Journal.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to]) + cond.add(["#{Journal.table_name}.journalized_type = 'Issue' AND #{Journal.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to]) + cond.add("#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> ''") @events += Journal.find(:all, :include => [{:issue => :project}, :details, :user], :conditions => cond.conditions) end |