##// END OF EJS Templates
Fixed: error when using a custom query feed with custom field filter....
Jean-Philippe Lang -
r454:5097f6394de9
parent child
Show More
@@ -44,7 +44,7 class FeedsController < ApplicationController
44 end
44 end
45
45
46 Issue.with_scope(:find => @find_options) do
46 Issue.with_scope(:find => @find_options) do
47 @issues = Issue.find :all, :include => [:project, :author, :tracker, :status],
47 @issues = Issue.find :all, :include => [:project, :author, :tracker, :status, :custom_values],
48 :order => "#{Issue.table_name}.created_on DESC"
48 :order => "#{Issue.table_name}.created_on DESC"
49 end
49 end
50 @title = (@project ? @project.name : Setting.app_title) + ": " + (query ? query.name : l(:label_reported_issues))
50 @title = (@project ? @project.name : Setting.app_title) + ": " + (query ? query.name : l(:label_reported_issues))
@@ -63,7 +63,7 class FeedsController < ApplicationController
63 end
63 end
64
64
65 Journal.with_scope(:find => @find_options) do
65 Journal.with_scope(:find => @find_options) do
66 @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status]} ],
66 @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status, :custom_values]} ],
67 :order => "#{Journal.table_name}.created_on DESC"
67 :order => "#{Journal.table_name}.created_on DESC"
68 end
68 end
69
69
General Comments 0
You need to be logged in to leave comments. Login now