Skip to content

Commit

Permalink
Provide the path to the custom branding assets instead of boolean
Browse files Browse the repository at this point in the history
  • Loading branch information
skateman committed Jan 29, 2019
1 parent 3d33b03 commit 10c676e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions app/controllers/api/api_controller.rb
Expand Up @@ -93,9 +93,9 @@ def image_path(image)

def branding_info
{
:brand => Settings.server.custom_brand || image_path('layout/brand.svg'),
:logo => Settings.server.custom_logo || image_path('layout/login-screen-logo.png'),
:login_logo => Settings.server.custom_login_logo.presence
:brand => Settings.server.custom_brand ? image_path('/upload/custom_brand.png') : image_path('layout/brand.svg'),
:logo => Settings.server.custom_logo ? image_path('/upload/custom_logo.png') : image_path('layout/login-screen-logo.png'),
:login_logo => Settings.server.custom_login_logo ? image_path('/upload/custom_login_logo.png') : nil
}.compact
end

Expand Down

0 comments on commit 10c676e

Please sign in to comment.