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
This commit is contained in:
parent
77cfc1cc59
commit
5097f6394d
|
@ -44,7 +44,7 @@ class FeedsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
Issue.with_scope(:find => @find_options) do
|
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"
|
:order => "#{Issue.table_name}.created_on DESC"
|
||||||
end
|
end
|
||||||
@title = (@project ? @project.name : Setting.app_title) + ": " + (query ? query.name : l(:label_reported_issues))
|
@title = (@project ? @project.name : Setting.app_title) + ": " + (query ? query.name : l(:label_reported_issues))
|
||||||
|
@ -63,7 +63,7 @@ class FeedsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
Journal.with_scope(:find => @find_options) do
|
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"
|
:order => "#{Journal.table_name}.created_on DESC"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue