From 5266ffc0494c88ffe367e4e45a212207cef2355a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 30 Nov 2025 21:07:46 +0100 Subject: [PATCH] Always just go through the settings object --- app/controllers/rooms_controller.rb | 2 +- test/controllers/rooms/closeds_controller_test.rb | 2 +- test/controllers/rooms/opens_controller_test.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb index 5de20f2..2c308c8 100644 --- a/app/controllers/rooms_controller.rb +++ b/app/controllers/rooms_controller.rb @@ -32,7 +32,7 @@ class RoomsController < ApplicationController end def ensure_permission_to_create_rooms - if Current.account.restrict_room_creation_to_administrators? && !Current.user.administrator? + if Current.account.settings.restrict_room_creation_to_administrators? && !Current.user.administrator? head :forbidden end end diff --git a/test/controllers/rooms/closeds_controller_test.rb b/test/controllers/rooms/closeds_controller_test.rb index a7200f4..d8976ac 100644 --- a/test/controllers/rooms/closeds_controller_test.rb +++ b/test/controllers/rooms/closeds_controller_test.rb @@ -30,7 +30,7 @@ class Rooms::ClosedsControllerTest < ActionDispatch::IntegrationTest end test "create forbidden by non-admin when account restricts creation to admins" do - accounts(:signal).restrict_room_creation_to_administrators = true + accounts(:signal).settings.restrict_room_creation_to_administrators = true accounts(:signal).save! sign_in :jz diff --git a/test/controllers/rooms/opens_controller_test.rb b/test/controllers/rooms/opens_controller_test.rb index f06aacb..0f91294 100644 --- a/test/controllers/rooms/opens_controller_test.rb +++ b/test/controllers/rooms/opens_controller_test.rb @@ -25,7 +25,7 @@ class Rooms::OpensControllerTest < ActionDispatch::IntegrationTest end test "create forbidden by non-admin when account restricts creation to admins" do - accounts(:signal).restrict_room_creation_to_administrators = true + accounts(:signal).settings.restrict_room_creation_to_administrators = true accounts(:signal).save! sign_in :jz