Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: include both name and id in color scheme stylesheet filename slugs (#10397)

This commit is contained in:
Penar Musaraj 2020-08-07 13:43:45 -04:00 committed by GitHub
parent 07dc5b5269
commit f179510a68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/stylesheet/manager.rb
View File

@ -106,7 +106,7 @@ class Stylesheet::Manager
target = COLOR_SCHEME_STYLESHEET.to_sym
current_hostname = Discourse.current_hostname
color_scheme_name = Slug.for(color_scheme.name)
color_scheme_name = Slug.for(color_scheme.name) + color_scheme&.id.to_s
array_cache_key = "color_scheme_stylesheet_#{color_scheme_name}_#{current_hostname}"
stylesheets = cache[array_cache_key]
return stylesheets if stylesheets.present?
@ -300,7 +300,7 @@ class Stylesheet::Manager
if is_theme?
"#{@target}_#{theme.id}"
elsif @color_scheme
"#{@target}_#{Slug.for(@color_scheme.name)}"
"#{@target}_#{Slug.for(@color_scheme.name) + @color_scheme&.id.to_s}"
else
scheme_string = theme && theme.color_scheme ? "_#{theme.color_scheme.id}" : ""
"#{@target}#{scheme_string}"

7
spec/components/stylesheet/manager_spec.rb
View File

@ -193,12 +193,13 @@ describe Stylesheet::Manager do
SiteSetting.default_theme_id = theme.id
link = Stylesheet::Manager.color_scheme_stylesheet_link_tag()
expect(link).to include("/stylesheets/color_definitions_funky_")
expect(link).to include("/stylesheets/color_definitions_funky#{cs.id}_")
end
it "uses the correct scheme when colors are passed" do
link = Stylesheet::Manager.color_scheme_stylesheet_link_tag(ColorScheme.first.id)
expect(link).to include("/stylesheets/color_definitions_#{Slug.for(ColorScheme.first.name)}_")
slug = Slug.for(ColorScheme.first.name) + ColorScheme.first.id.to_s
expect(link).to include("/stylesheets/color_definitions_#{slug}_")
end
it "does not fail with a color scheme name containing spaces and special characters" do
@ -207,7 +208,7 @@ describe Stylesheet::Manager do
SiteSetting.default_theme_id = theme.id
link = Stylesheet::Manager.color_scheme_stylesheet_link_tag()
expect(link).to include("/stylesheets/color_definitions_funky-bunch_")
expect(link).to include("/stylesheets/color_definitions_funky-bunch#{cs.id}_")
end
end