Merge pull request #127 from robinboening/layout_configuration

Allow setting a layout for user_sessions and passwords controller
AlchemyCMS · Feb 29, 2024 · 8ebd445 · 8ebd445
2 parents 874cece + c25e338
commit 8ebd445
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/app/controllers/alchemy/admin/passwords_controller.rb b/app/controllers/alchemy/admin/passwords_controller.rb
@@ -9,7 +9,7 @@ class PasswordsController < ::Devise::PasswordsController
 
       helper "Alchemy::Admin::Base"
 
-      layout "alchemy/admin"
+      layout Alchemy::Devise.layout
 
       private
 

diff --git a/app/controllers/alchemy/admin/user_sessions_controller.rb b/app/controllers/alchemy/admin/user_sessions_controller.rb
@@ -13,7 +13,7 @@ class UserSessionsController < ::Devise::SessionsController
 
       helper "Alchemy::Admin::Base"
 
-      layout "alchemy/admin"
+      layout Alchemy::Devise.layout
 
       def create
         authenticate_user!

diff --git a/lib/alchemy/devise.rb b/lib/alchemy/devise.rb
@@ -37,5 +37,12 @@ def self.devise_modules
   end
 
   module Devise
+    def self.layout=(value)
+      @layout = value
+    end
+
+    def self.layout
+      @layout || "alchemy/admin"
+    end
   end
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ class PasswordsController < ::Devise::PasswordsController @@
           helper "Alchemy::Admin::Base"
-          layout "alchemy/admin"
+          layout Alchemy::Devise.layout
           private
@@ Expand Down @@