##// END OF EJS Templates
jro_apps » redmine
RSS
fixed #9398 RSS feed on custom reports not displaying subproject changes...
Jean-Philippe Lang -
r355:8bf5759d2694
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,100 +1,96
1 # redMine - project management software
1 # redMine - project management software
2 # Copyright (C) 2006-2007 Jean-Philippe Lang
2 # Copyright (C) 2006-2007 Jean-Philippe Lang
3 #
3 #
4 # This program is free software; you can redistribute it and/or
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
18 class FeedsController < ApplicationController
18 class FeedsController < ApplicationController
19 before_filter :find_scope
19 before_filter :find_scope
20 session :off
20 session :off
21
21
22 helper :issues
22 helper :issues
23 include IssuesHelper
23 include IssuesHelper
24 helper :custom_fields
24 helper :custom_fields
25 include CustomFieldsHelper
25 include CustomFieldsHelper
26
26
27 # news feeds
27 # news feeds
28 def news
28 def news
29 News.with_scope(:find => @find_options) do
29 News.with_scope(:find => @find_options) do
30 @news = News.find :all, :order => "#{News.table_name}.created_on DESC", :include => [ :author, :project ]
30 @news = News.find :all, :order => "#{News.table_name}.created_on DESC", :include => [ :author, :project ]
31 end
31 end
32 headers["Content-Type"] = "application/rss+xml"
32 headers["Content-Type"] = "application/rss+xml"
33 render :action => 'news_atom' if 'atom' == params[:format]
33 render :action => 'news_atom' if 'atom' == params[:format]
34 end
34 end
35
35
36 # issue feeds
36 # issue feeds
37 def issues
37 def issues
38 conditions = nil
38 if @project && params[:query_id]
39
40 if params[:query_id]
41 query = Query.find(params[:query_id])
39 query = Query.find(params[:query_id])
42 # ignore query if it's not valid
40 # ignore query if it's not valid
43 query = nil unless query.valid?
41 query = nil unless query.valid?
44 conditions = query.statement if query
42 # override with query conditions
43 @find_options[:conditions] = query.statement if query.valid? and @project == query.project
45 end
44 end
46
45
47 Issue.with_scope(:find => @find_options) do
46 Issue.with_scope(:find => @find_options) do
48 @issues = Issue.find :all, :include => [:project, :author, :tracker, :status],
47 @issues = Issue.find :all, :include => [:project, :author, :tracker, :status],
49 :order => "#{Issue.table_name}.created_on DESC",
48 :order => "#{Issue.table_name}.created_on DESC"
50 :conditions => conditions
51 end
49 end
52 @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))
53 headers["Content-Type"] = "application/rss+xml"
51 headers["Content-Type"] = "application/rss+xml"
54 render :action => 'issues_atom' if 'atom' == params[:format]
52 render :action => 'issues_atom' if 'atom' == params[:format]
55 end
53 end
56
54
57 # issue changes feeds
55 # issue changes feeds
58 def history
56 def history
59 conditions = nil
57 if @project && params[:query_id]
60
61 if params[:query_id]
62 query = Query.find(params[:query_id])
58 query = Query.find(params[:query_id])
63 # ignore query if it's not valid
59 # ignore query if it's not valid
64 query = nil unless query.valid?
60 query = nil unless query.valid?
65 conditions = query.statement if query
61 # override with query conditions
62 @find_options[:conditions] = query.statement if query.valid? and @project == query.project
66 end
63 end
67
64
68 Journal.with_scope(:find => @find_options) do
65 Journal.with_scope(:find => @find_options) do
69 @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]} ],
70 :order => "#{Journal.table_name}.created_on DESC",
67 :order => "#{Journal.table_name}.created_on DESC"
71 :conditions => conditions
72 end
68 end
73
69
74 @title = (@project ? @project.name : Setting.app_title) + ": " + (query ? query.name : l(:label_reported_issues))
70 @title = (@project ? @project.name : Setting.app_title) + ": " + (query ? query.name : l(:label_reported_issues))
75 headers["Content-Type"] = "application/rss+xml"
71 headers["Content-Type"] = "application/rss+xml"
76 render :action => 'history_atom' if 'atom' == params[:format]
72 render :action => 'history_atom' if 'atom' == params[:format]
77 end
73 end
78
74
79 private
75 private
80 # override for feeds specific authentication
76 # override for feeds specific authentication
81 def check_if_login_required
77 def check_if_login_required
82 @user = User.find_by_rss_key(params[:key])
78 @user = User.find_by_rss_key(params[:key])
83 render(:nothing => true, :status => 403) and return false if !@user && Setting.login_required?
79 render(:nothing => true, :status => 403) and return false if !@user && Setting.login_required?
84 end
80 end
85
81
86 def find_scope
82 def find_scope
87 if params[:project_id]
83 if params[:project_id]
88 # project feed
84 # project feed
89 # check if project is public or if the user is a member
85 # check if project is public or if the user is a member
90 @project = Project.find(params[:project_id])
86 @project = Project.find(params[:project_id])
91 render(:nothing => true, :status => 403) and return false unless @project.is_public? || (@user && @user.role_for_project(@project.id))
87 render(:nothing => true, :status => 403) and return false unless @project.is_public? || (@user && @user.role_for_project(@project.id))
92 scope = ["#{Project.table_name}.id=?", params[:project_id].to_i]
88 scope = ["#{Project.table_name}.id=?", params[:project_id].to_i]
93 else
89 else
94 # global feed
90 # global feed
95 scope = ["#{Project.table_name}.is_public=?", true]
91 scope = ["#{Project.table_name}.is_public=?", true]
96 end
92 end
97 @find_options = {:conditions => scope, :limit => Setting.feeds_limit}
93 @find_options = {:conditions => scope, :limit => Setting.feeds_limit}
98 return true
94 return true
99 end
95 end
100 end
96 end
General Comments 0
You need to be logged in to leave comments. Login now