Ah, that doesn't work due to 'bugs' in the way layouts work - only the last command has any effect
This commit is contained in:
parent
5531c0bf34
commit
0531a7dfa1
1 changed files with 2 additions and 2 deletions
|
@ -1,6 +1,5 @@
|
||||||
class UserController < ApplicationController
|
class UserController < ApplicationController
|
||||||
layout 'site', :except => [:api_details, :login]
|
layout 'site', :except => [:api_details]
|
||||||
layout 'slim', :only => :login
|
|
||||||
|
|
||||||
before_filter :authorize, :only => [:api_details, :api_gpx_files]
|
before_filter :authorize, :only => [:api_details, :api_gpx_files]
|
||||||
before_filter :authorize_web, :except => [: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?
|
elsif flash[:notice].nil?
|
||||||
flash.now[:notice] = t 'user.login.notice'
|
flash.now[:notice] = t 'user.login.notice'
|
||||||
end
|
end
|
||||||
|
render :layout => 'slim'
|
||||||
end
|
end
|
||||||
|
|
||||||
def logout
|
def logout
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue