diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:20:59 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:20:59 +0200 |
| commit | daad07b1d552d5af06b4d8443afdbe1350785a14 (patch) | |
| tree | 4062f211cd6e307a5bbb7c338263f366a9fafade /app/controllers | |
| parent | 83bda6c1a813c5aeb131b18a0500fed0c07fa9c2 (diff) | |
| parent | f7ca205f382a9d528bf37e3ec38ee8bf77dccccf (diff) | |
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0b40fb05b..d5eca6ffb 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -12,6 +12,7 @@ class ApplicationController < ActionController::Base helper_method :current_account helper_method :current_session + helper_method :current_theme helper_method :single_user_mode? rescue_from ActionController::RoutingError, with: :not_found @@ -77,6 +78,11 @@ class ApplicationController < ActionController::Base @current_session ||= SessionActivation.find_by(session_id: cookies.signed['_session_id']) end + def current_theme + return Setting.default_settings['theme'] unless Themes.instance.names.include? current_user&.setting_theme + current_user.setting_theme + end + def cache_collection(raw, klass) return raw unless klass.respond_to?(:with_includes) diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index f107f2b16..207c7b324 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -41,6 +41,7 @@ class Settings::PreferencesController < ApplicationController :setting_auto_play_gif, :setting_system_font_ui, :setting_noindex, + :setting_theme, notification_emails: %i(follow follow_request reblog favourite mention digest), interactions: %i(must_be_follower must_be_following) ) |