Fix duplicated application layout (#127)

obl-ong · Mar 1, 2024 · 851ae89 · 851ae89
1 parent 97f6a95
commit 851ae89
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
@@ -1,5 +1,6 @@
 class AdminController < ApplicationController
-  nested_layouts "layouts/application"
+  layout "application"
+  nested_layouts "layouts/admin"
 
   before_action :require_admin
 

diff --git a/app/controllers/developers/applications_controller.rb b/app/controllers/developers/applications_controller.rb
@@ -1,5 +1,5 @@
 class Developers::ApplicationsController < ApplicationController
-  nested_layouts "layouts/admin", "layouts/application"
+  nested_layouts "layouts/admin"
 
   before_action do
     @developers = true

diff --git a/app/controllers/domains_controller.rb b/app/controllers/domains_controller.rb
@@ -9,8 +9,8 @@ class DomainsController < ApplicationController
   skip_before_action :require_admin, except: [:create, :transfer]
 
   helper DnsimpleHelper
-  nested_layouts "layouts/admin", "layouts/domain", "layouts/application", except: [:index, :request_domain, :show]
-  nested_layouts "layouts/admin", "layouts/application", only: [:index, :request_domain]
+  nested_layouts "layouts/admin", "layouts/domain", except: [:index, :request_domain, :show]
+  nested_layouts "layouts/admin", only: [:index, :request_domain]
 
   def index
     @domains = Domain.where(user_users_id: current_user.id)