Add support for multiple themes (#4959)
* Add support for selecting a theme * Fix codeclimate issues * Look up site default style if current user is not available due to e.g. not being logged in * Remove outdated comment in common.js * Address requested changes in themes PR * Fix codeclimate issues * Explicitly check current_account in application controller and only check theme availability if non-nil * codeclimate * explicit precedence with && * Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml * codeclimate: indentation + return
This commit is contained in:
parent
4aea3f88a6
commit
0401a24558
15 changed files with 64 additions and 21 deletions
|
@ -110,6 +110,10 @@ class User < ApplicationRecord
|
|||
settings.noindex
|
||||
end
|
||||
|
||||
def setting_theme
|
||||
settings.theme
|
||||
end
|
||||
|
||||
def token_for_app(a)
|
||||
return nil if a.nil? || a.owner != self
|
||||
Doorkeeper::AccessToken
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue