jro_apps/redmine Commit - r3835:73ba49a7154a

Use the base layout for all 403, 404, and 500 pages. #6172...

Eric Davis -

r3835:73ba49a7154a

parent child

Context file:

r3835:73ba49a7154a

Collapse all files

test/integration/layout_test.rb created 644 +26 0

@@ -0,0 +1,26
	1	require "#{File.dirname(__FILE__)}/../test_helper"
	2
	3	class LayoutTest < ActionController::IntegrationTest
	4	fixtures :all
	5
	6	test "browsing to a missing page should render the base layout" do
	7	get "/users/100000000"
	8
	9	assert_response :not_found
	10
	11	# UsersController uses the admin layout by default
	12	assert_select "#admin-menu", :count => 0
	13	end
	14
	15	test "browsing to an unauthorized page should render the base layout" do
	16	user = User.find(9)
	17	user.password, user.password_confirmation = 'test', 'test'
	18	user.save!
	19
	20	log_user('miscuser9','test')
	21
	22	get "/admin"
	23	assert_response :forbidden
	24	assert_select "#admin-menu", :count => 0
	25	end
	26	end

app/controllers/application_controller.rb +10 -3

               def render_403
                 @project = nil
                 respond_to do |format|
-                  format.html { render :template => "common/403", :layout => (request.xhr? ? false : 'base'), :status => 403 }
+                  format.html { render :template => "common/403", :layout => use_layout, :status => 403 }
                   format.atom { head 403 }
                   format.xml { head 403 }
                   format.js { head 403 }
               def render_404
                 respond_to do |format|
-                  format.html { render :template => "common/404", :layout => !request.xhr?, :status => 404 }
+                  format.html { render :template => "common/404", :layout => use_layout, :status => 404 }
                   format.atom { head 404 }
                   format.xml { head 404 }
                   format.js { head 404 }
                 respond_to do |format|
                   format.html {
                     flash.now[:error] = msg
-                    render :text => '', :layout => !request.xhr?, :status => 500
+                    render :text => '', :layout => use_layout, :status => 500
                   }
                   format.atom { head 500 }
                   format.xml { head 500 }
                   format.json { head 500 }
                 end
               end
+              # Picks which layout to use based on the request
+              #
+              # @return [boolean, string] name of the layout to use or false for no layout
+              def use_layout
+                request.xhr? ? false : 'base'
+              end
               def invalid_authenticity_token
                 if api_request?

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages