From d96e031dfc0db84318af9f4371403cdcf5bc2804 Mon Sep 17 00:00:00 2001
From: Eugen <eugen@zeonfederated.com>
Date: Wed, 8 Feb 2017 03:04:29 +0100
Subject: [PATCH] Fix #611 - Layout setting in registrations controller
---
app/controllers/auth/registrations_controller.rb | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index b7d019c24..501e66807 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -1,8 +1,7 @@
# frozen_string_literal: true
class Auth::RegistrationsController < Devise::RegistrationsController
- layout 'auth'
- layout 'admin', only: [:edit]
+ layout :determine_layout
before_action :check_single_user_mode
before_action :configure_sign_up_params, only: [:create]
@@ -31,4 +30,10 @@ class Auth::RegistrationsController < Devise::RegistrationsController
def check_single_user_mode
redirect_to root_path if Rails.configuration.x.single_user_mode
end
+
+ private
+
+ def determine_layout
+ %w(edit update).include?(action_name) ? 'admin' : 'auth'
+ end
end