tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #611 - Layout setting in registrations controller

This commit is contained in:
Eugen 2017-02-08 03:04:29 +01:00 committed by GitHub
parent aa1213e089
commit d96e031dfc
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/auth/registrations_controller.rb
View File

@ -1,8 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
class Auth::RegistrationsController < Devise::RegistrationsController class Auth::RegistrationsController < Devise::RegistrationsController
layout 'auth' layout :determine_layout
layout 'admin', only: [:edit]
before_action :check_single_user_mode before_action :check_single_user_mode
before_action :configure_sign_up_params, only: [:create] before_action :configure_sign_up_params, only: [:create]
@ -31,4 +30,10 @@ class Auth::RegistrationsController < Devise::RegistrationsController
def check_single_user_mode def check_single_user_mode
redirect_to root_path if Rails.configuration.x.single_user_mode redirect_to root_path if Rails.configuration.x.single_user_mode
end end
private
def determine_layout
%w(edit update).include?(action_name) ? 'admin' : 'auth'
end
end end