Fix

openware · Jan 26, 2018 · f8b5678 · f8b5678
1 parent 9912bed
commit f8b5678
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -5,8 +5,9 @@ class ApplicationController < ActionController::Base
   before_action :domain_stylesheet
 
   def domain_stylesheet
+    return unless  @stylesheet_url.nil?
     website = Website.find_by_domain(request.domain)
-    @styles = website.nil? || website.stylesheet.empty? ? nil : website.stylesheet
+    @stylesheet_url = website.nil? || website.stylesheet.empty? ? :default : website.stylesheet
   end
 
   def doorkeeper_unauthorized_render_options(error: nil)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -1,4 +1,7 @@
 # frozen_string_literal: true
 
 module ApplicationHelper
+  def domain_stylesheet_tag(url)
+    return stylesheet_link_tag(url) unless url.nil?
+  end
 end
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
@@ -5,7 +5,7 @@
     <title>Barong Admin</title>
     <%= csrf_meta_tags %>
     <%= stylesheet_link_tag    'admin', media: 'all' %>
-    <%= stylesheet_link_tag @styles unless @styles.nil? %>
+    <%= domain_stylesheet_tag(@stylesheet_url) %>
     <%= javascript_include_tag 'admin' %>
   </head>
   <body>

diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
@@ -5,7 +5,7 @@
   <%= csrf_meta_tags %>
 
   <%= stylesheet_link_tag    'web', media: 'all' %>
-  <%= stylesheet_link_tag @styles unless @styles.nil? %>
+  <%= domain_stylesheet_tag(@stylesheet_url) %>
   <%= javascript_include_tag 'web' %>
 </head>
 <body class="devise">

diff --git a/app/views/layouts/documents.html.erb b/app/views/layouts/documents.html.erb
@@ -5,7 +5,7 @@
   <title>Barong</title>
   <%= csrf_meta_tags %>
   <%= stylesheet_link_tag    'web', media: 'all' %>
-  <%= stylesheet_link_tag @styles unless @styles.nil? %>
+  <%= domain_stylesheet_tag(@stylesheet_url) %>
   <%= javascript_include_tag 'web' %>
 </head>
 <body>

diff --git a/app/views/layouts/profiles.html.erb b/app/views/layouts/profiles.html.erb
@@ -5,7 +5,7 @@
   <title>Barong</title>
   <%= csrf_meta_tags %>
   <%= stylesheet_link_tag    'web', media: 'all' %>
-  <%= stylesheet_link_tag @styles unless @styles.nil? %>
+  <%= domain_stylesheet_tag(@stylesheet_url) %>
   <%= javascript_include_tag 'web' %>
 </head>
 <body>

diff --git a/app/views/layouts/web.html.erb b/app/views/layouts/web.html.erb
@@ -5,7 +5,7 @@
   <%= csrf_meta_tags %>
 
   <%= stylesheet_link_tag    'web', media: 'all' %>
-  <%= stylesheet_link_tag @styles unless @styles.nil? %>
+  <%= domain_stylesheet_tag(@stylesheet_url) %>
   <%= javascript_include_tag 'web' %>
 </head>
 <body class="devise">