diff --git a/app/controllers/contexts_controller.rb b/app/controllers/contexts_controller.rb index c2c99d31..8fee9110 100644 --- a/app/controllers/contexts_controller.rb +++ b/app/controllers/contexts_controller.rb @@ -18,11 +18,7 @@ class ContextsController < ApplicationController format.html &render_contexts_html format.m &render_contexts_mobile format.xml { render :xml => @all_contexts.to_xml( :except => :user_id ) } - format.rss do - @feed_title = 'Tracks Contexts' - @feed_description = "Lists all the contexts for #{current_user.display_name}" - end - format.atom do + format.any(:rss, :atom) do @feed_title = 'Tracks Contexts' @feed_description = "Lists all the contexts for #{current_user.display_name}" end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index eb3c2d21..f4f881a7 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -38,11 +38,7 @@ class ProjectsController < ApplicationController cookies[:mobile_url]= {:value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']} end format.xml { render :xml => @projects.to_xml( :except => :user_id ) } - format.rss do - @feed_title = I18n.t('models.project.feed_title') - @feed_description = I18n.t('models.project.feed_description', :username => current_user.display_name) - end - format.atom do + format.any(:rss, :atom) do @feed_title = I18n.t('models.project.feed_title') @feed_description = I18n.t('models.project.feed_description', :username => current_user.display_name) end diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index 551ed1be..b3439136 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -48,8 +48,7 @@ class TodosController < ApplicationController render :content_type => Mime::TEXT end format.xml { render :xml => @todos.to_xml( *todo_xml_params ) } - format.rss { @feed_title, @feed_description = 'Tracks Actions', "Actions for #{current_user.display_name}" } - format.atom { @feed_title, @feed_description = 'Tracks Actions', "Actions for #{current_user.display_name}" } + format.any(:rss, :atom) { @feed_title, @feed_description = 'Tracks Actions', "Actions for #{current_user.display_name}" } format.ics end end diff --git a/lib/login_system.rb b/lib/login_system.rb index aeeb2c8e..ef8e0164 100644 --- a/lib/login_system.rb +++ b/lib/login_system.rb @@ -160,13 +160,10 @@ module LoginSystem format.html { redirect_to login_path } format.m { redirect_to login_path(:format => 'm') } format.js { render :partial => 'login/redirect_to_login' } - format.xml { basic_auth_denied } - format.rss { basic_auth_denied } - format.atom { basic_auth_denied } - format.text { basic_auth_denied } + format.any(:xml, :rss, :atom, :text) { basic_auth_denied } end end - + # store current uri in the session. # we can return to this location by calling return_location def store_location