From 851ae89c9e70b5b834bb9e2a07442f89bdcc7eab Mon Sep 17 00:00:00 2001 From: Caleb Denio Date: Thu, 29 Feb 2024 23:32:12 -0500 Subject: [PATCH] Fix duplicated `application` layout (#127) --- app/controllers/admin_controller.rb | 3 ++- app/controllers/developers/applications_controller.rb | 2 +- app/controllers/domains_controller.rb | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index ac6222a..212a19b 100644 --- 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 index 57ad374..c417506 100644 --- 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 index 0699180..b352599 100644 --- 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)