From b165cfdfbe227374f4379687d6e9157742dab00a Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 19 Jul 2018 16:34:11 +0800 Subject: [PATCH] FIX: Raise a better error in `SiteSettings::TypeSupervisor`. --- lib/site_settings/type_supervisor.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/site_settings/type_supervisor.rb b/lib/site_settings/type_supervisor.rb index caf34f62002..f1ca2e3110e 100644 --- a/lib/site_settings/type_supervisor.rb +++ b/lib/site_settings/type_supervisor.rb @@ -170,7 +170,11 @@ class SiteSettings::TypeSupervisor if enum_class(name) raise Discourse::InvalidParameters.new(:value) unless enum_class(name).valid_value?(val) else - raise Discourse::InvalidParameters.new(:value) unless @choices[name].include?(val) + unless (choice = @choices[name]) + raise Discourse::InvalidParameters.new(name) + end + + raise Discourse::InvalidParameters.new(:value) unless choice.include?(val) end end