From 5097f6394de9485b019607324f1d535b0f155356 2007-04-21 13:16:04 From: Jean-Philippe Lang Date: 2007-04-21 13:16:04 Subject: [PATCH] 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 --- diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb index d46a63e..9314db5 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