IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

I committed a regression around multi site today and site customization, added tests so it don't happen again

Browse Source
This commit is contained in:
Sam Saffron
2013-02-08 00:55:04 +11:00
parent 168bb01439
commit 4fcd924797
2 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/models/site_customization.rb
View File

@@ -50,30 +50,36 @@ footer:after{ content: '#{error}' }"
self.remove_from_cache!
end
def self.enabled_style
def self.enabled_key
ENABLED_KEY.dup << RailsMultisite::ConnectionManagement.current_db
end
def self.enabled_style_key
@cache ||= {}
preview_style = @cache[ENABLED_KEY]
preview_style = @cache[self.enabled_key]
return nil if preview_style == :none
return preview_style if preview_style
@lock.synchronize do
style = self.where(enabled: true).first
if style
@cache[ENABLED_KEY] = style.key
@cache[self.enabled_key] = style.key
return style.key
else
@cache[ENABLED_KEY] = :none
@cache[self.enabled_key] = :none
return nil
end
end
end
def self.custom_stylesheet(preview_style)
preview_style ||= enabled_style
preview_style ||= enabled_style_key
style = lookup_style(preview_style)
style.stylesheet_link_tag.html_safe if style
end
def self.custom_header(preview_style)
preview_style ||= enabled_style
preview_style ||= enabled_style_key
style = lookup_style(preview_style)
if style && style.header
style.header.html_safe
@@ -83,7 +89,7 @@ footer:after{ content: '#{error}' }"
end
def self.override_default_style(preview_style)
preview_style ||= enabled_style
preview_style ||= enabled_style_key
style = lookup_style(preview_style)
style.override_default_style if style
end
@@ -126,7 +132,7 @@ footer:after{ content: '#{error}' }"
end
def remove_from_cache!
self.class.remove_from_cache!(ENABLED_KEY)
self.class.remove_from_cache!(self.class.enabled_key)
self.class.remove_from_cache!(self.key)
end