From 1f991c6a792a76de50d6b373510544e6469751b3 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 16 Aug 2007 11:01:00 +0000 Subject: Added feeds auto discovery links on projects/show (patch by Nicolas Chuche). Also fixed 'issue changes details' feed title. git-svn-id: http://redmine.rubyforge.org/svn/trunk@647 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/feeds_controller.rb | 2 +- app/controllers/projects_controller.rb | 2 ++ app/controllers/welcome_controller.rb | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) (limited to 'app/controllers') diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb index bf03acbc9..aaba4ac57 100644 --- a/app/controllers/feeds_controller.rb +++ b/app/controllers/feeds_controller.rb @@ -69,7 +69,7 @@ class FeedsController < ApplicationController :order => "#{Journal.table_name}.created_on DESC" 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_changes_details)) headers["Content-Type"] = "application/rss+xml" render :action => 'history_atom' if 'atom' == params[:format] end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 70b9b407d..582ff3367 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -95,6 +95,8 @@ class ProjectsController < ApplicationController @trackers = Tracker.find(:all, :order => 'position') @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN #{IssueStatus.table_name} ON #{IssueStatus.table_name}.id = #{Issue.table_name}.status_id", :conditions => ["project_id=? and #{IssueStatus.table_name}.is_closed=?", @project.id, false]) @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id]) + + @key = logged_in_user.get_or_create_rss_key.value if logged_in_user end def settings diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 2eac2268f..7b1c398d1 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -21,5 +21,7 @@ class WelcomeController < ApplicationController def index @news = News.latest logged_in_user @projects = Project.latest logged_in_user + + @key = logged_in_user.get_or_create_rss_key.value if logged_in_user end end -- cgit v1.2.3