about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorJakub Mendyk <jakubmendyk.szkola+git@gmail.com>2018-08-23 14:17:35 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-08-23 14:17:35 +0200
commit6cb3514d64ec24b164484f4eb84363b96746d5d6 (patch)
tree7de47dff8b187bb5921e7b7a331a9ef487a1cae5 /app/controllers
parentd1c2c917d9685879d9c5cd203e416a8ef796f1e1 (diff)
Add ability to change an instance default theme from the administration panel (#7092) (#8381)
* 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
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/admin/settings_controller.rb1
-rw-r--r--app/controllers/application_controller.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index 3234b194f..23e0444d0 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -16,6 +16,7 @@ module Admin
       timeline_preview
       show_staff_badge
       bootstrap_timeline_accounts
+      theme
       thumbnail
       hero
       min_invite_role
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index eafe27047..7ddd26ec0 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -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