mirror of
				https://github.com/redmine/redmine.git
				synced 2025-10-31 10:25:55 +01:00 
			
		
		
		
	Adds asset path to default to support old style theme (#39111).
Patch by Takashi Kato (user:tohosaku). git-svn-id: https://svn.redmine.org/redmine/trunk@23173 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
		| @@ -24,7 +24,10 @@ Redmine::PluginLoader.load | |||||||
|  |  | ||||||
| Rails.application.config.to_prepare do | Rails.application.config.to_prepare do | ||||||
|   default_paths = [] |   default_paths = [] | ||||||
|   Rails.application.config.assets.redmine_default_asset_path = Redmine::AssetPath.new(Rails.public_path, default_paths) |   default_paths << Rails.root.join("app/assets/javascripts") | ||||||
|  |   default_paths << Rails.root.join("app/assets/images") | ||||||
|  |   default_paths << Rails.root.join("app/assets/stylesheets") | ||||||
|  |   Rails.application.config.assets.redmine_default_asset_path = Redmine::AssetPath.new(Rails.root.join('app/assets'), default_paths) | ||||||
|  |  | ||||||
|   Redmine::FieldFormat::RecordList.subclasses.each do |klass| |   Redmine::FieldFormat::RecordList.subclasses.each do |klass| | ||||||
|     klass.instance.reset_target_class |     klass.instance.reset_target_class | ||||||
|   | |||||||
| @@ -109,4 +109,17 @@ class ThemesTest < Redmine::IntegrationTest | |||||||
|     assert_response :success |     assert_response :success | ||||||
|     assert_select 'body[class~="theme-Foo_bar_baz"]' |     assert_select 'body[class~="theme-Foo_bar_baz"]' | ||||||
|   end |   end | ||||||
|  |  | ||||||
|  |   def test_old_theme_compatibility | ||||||
|  |     @theme = Redmine::Themes::Theme.new(Rails.root.join('test/fixtures/themes/foo_theme')) | ||||||
|  |     Rails.application.config.assets.redmine_extension_paths << @theme.asset_paths | ||||||
|  |     Setting.ui_theme = @theme.id | ||||||
|  |     Rails.application.assets.load_path.clear_cache | ||||||
|  |  | ||||||
|  |     asset = Rails.application.assets.load_path.find('themes/foo_theme/application.css') | ||||||
|  |     get "/assets/#{asset.digested_path.to_s}" | ||||||
|  |  | ||||||
|  |     assert_response :success | ||||||
|  |     assert_match %r{url\(\"/assets/application-\w+\.css\"\)}, response.body | ||||||
|  |   end | ||||||
| end | end | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user