kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed #9398 RSS feed on custom reports not displaying subproject changes 

git-svn-id: http://redmine.rubyforge.org/svn/trunk@358 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2007-03-20 18:55:33 +00:00
parent cbf797ed95
commit 8bf5759d26
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/controllers/feeds_controller.rb
View File

@ -35,19 +35,17 @@ class FeedsController < ApplicationController
# issue feeds # issue feeds
def issues def issues
conditions = nil if @project && params[:query_id]
if params[:query_id]
query = Query.find(params[:query_id]) query = Query.find(params[:query_id])
# ignore query if it's not valid # ignore query if it's not valid
query = nil unless query.valid? query = nil unless query.valid?
conditions = query.statement if query # override with query conditions
@find_options[:conditions] = query.statement if query.valid? and @project == query.project
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],
:order => "#{Issue.table_name}.created_on DESC", :order => "#{Issue.table_name}.created_on DESC"
:conditions => conditions
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))
headers["Content-Type"] = "application/rss+xml" headers["Content-Type"] = "application/rss+xml"
@ -55,20 +53,18 @@ class FeedsController < ApplicationController
end end
# issue changes feeds # issue changes feeds
def history def history
conditions = nil if @project && params[:query_id]
if params[:query_id]
query = Query.find(params[:query_id]) query = Query.find(params[:query_id])
# ignore query if it's not valid # ignore query if it's not valid
query = nil unless query.valid? query = nil unless query.valid?
conditions = query.statement if query # override with query conditions
@find_options[:conditions] = query.statement if query.valid? and @project == query.project
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]} ],
:order => "#{Journal.table_name}.created_on DESC", :order => "#{Journal.table_name}.created_on DESC"
:conditions => conditions
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))