techhub/mastodon
2
0
Fork 0
Code Activity

Add ability to change an instance default theme from the administration panel (#7092) (#8381)

Browse Source 
* Add default_settings class method to ScopedSettings

ScopedSettings was extended to use value of unscoped setting instead of
only using defaults set in config/settings.yml for selected settings.
This adds possibility for admins to set default values of users' settings,
for example default theme (as requested in #7092).

* Add ability to change an instance default theme

Closes #7092
This commit is contained in:
Jakub Mendyk
2018-08-23 14:17:35 +02:00
committed by Eugen Rochko
parent d1c2c917d9
commit 6cb3514d64
6 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@@ -95,7 +95,7 @@ class ApplicationController < ActionController::Base
end
def current_theme
return Setting.default_settings['theme'] unless Themes.instance.names.include? current_user&.setting_theme
return Setting.theme unless Themes.instance.names.include? current_user&.setting_theme
current_user.setting_theme
end