diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-04-21 13:16:04 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-04-21 13:16:04 +0000 |
| commit | 5097f6394de9485b019607324f1d535b0f155356 (patch) | |
| tree | c86464b33fad134bfe266803ba081f2b7da93cb0 /app/controllers | |
| parent | 77cfc1cc59c09fc7c3754a9b59a434c325483360 (diff) | |
| download | redmine-5097f6394de9485b019607324f1d535b0f155356.tar.gz redmine-5097f6394de9485b019607324f1d535b0f155356.zip | |
Fixed: error when using a custom query feed with custom field filter.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@457 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/feeds_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb index d46a63e38..9314db5e3 100644 --- a/app/controllers/feeds_controller.rb +++ b/app/controllers/feeds_controller.rb @@ -44,7 +44,7 @@ class FeedsController < ApplicationController end Issue.with_scope(:find => @find_options) do - @issues = Issue.find :all, :include => [:project, :author, :tracker, :status], + @issues = Issue.find :all, :include => [:project, :author, :tracker, :status, :custom_values], :order => "#{Issue.table_name}.created_on DESC" end @title = (@project ? @project.name : Setting.app_title) + ": " + (query ? query.name : l(:label_reported_issues)) @@ -63,7 +63,7 @@ class FeedsController < ApplicationController end Journal.with_scope(:find => @find_options) do - @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status]} ], + @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status, :custom_values]} ], :order => "#{Journal.table_name}.created_on DESC" end |