From 0531a7dfa1eaaff427ec98c23672f4358dbf94fd Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Thu, 27 Jan 2011 17:28:25 +0000 Subject: [PATCH] Ah, that doesn't work due to 'bugs' in the way layouts work - only the last command has any effect --- app/controllers/user_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 52c3deac8..3d2012064 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -1,6 +1,5 @@ class UserController < ApplicationController - layout 'site', :except => [:api_details, :login] - layout 'slim', :only => :login + layout 'site', :except => [:api_details] before_filter :authorize, :only => [:api_details, :api_gpx_files] before_filter :authorize_web, :except => [:api_details, :api_gpx_files] @@ -258,6 +257,7 @@ class UserController < ApplicationController elsif flash[:notice].nil? flash.now[:notice] = t 'user.login.notice' end + render :layout => 'slim' end def logout -- 2.43.2