github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:21:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "DEV: Add configurable? helper to Plugin::Instance (#20767)" (#21469)

Browse Source 
This reverts commit 3073e5cfb0721b3b8009963c5fc7f61d414db317.
This commit is contained in:
Joffrey JAFFEUX
2023-05-10 12:41:55 +02:00
committed by GitHub
parent 3073e5cfb0
commit 3727c95f6f
7 changed files with 16 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/site_setting_extension.rb
View File

@ -166,20 +166,6 @@ module SiteSettingExtension
end
end
def remove_setting(name_arg)
raise if !Rails.env.test?
name = name_arg.to_sym
categories.delete(name)
hidden_settings.delete(name)
refresh_settings.delete(name)
client_settings.delete(name)
previews.delete(name)
secret_settings.delete(name)
plugins.delete(name)
end
def settings_hash
result = {}
deprecated_settings = Set.new
@ -238,9 +224,6 @@ module SiteSettingExtension
defaults
.all(default_locale)
.filter do |setting_name, _|
!plugins[setting_name] || Discourse.plugins_by_name[plugins[setting_name]].configurable?
end
.reject { |setting_name, _| !include_hidden && hidden_settings.include?(setting_name) }
.map do |s, v|
type_hash = type_supervisor.type_hash(s)
@ -561,11 +544,6 @@ module SiteSettingExtension
end
else
define_singleton_method clean_name do
if plugins[name]
plugin = Discourse.plugins_by_name[plugins[name]]
return false if !plugin.configurable? && plugin.enabled_site_setting == name
end
if (c = current[name]).nil?
refresh!
current[name]