github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 21:45:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Allow importing themes with subdirectories in extra_js

Browse Source 
The folder/file detection was broken by 9fea43e46a7bb9ee1f8a3ce9d22bb41664f0852a. This commit fixes and adds relevant specs
This commit is contained in:
David Taylor
2019-11-13 23:45:09 +00:00
parent 0ba0aa00e7
commit d095c2cee7
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/theme_store/git_importer.rb
View File

@ -80,7 +80,7 @@ class ThemeStore::GitImporter
end
def all_files
Dir.glob("**/*", base: @temp_folder).reject { |f| File.directory?(f) }
Dir.glob("**/*", base: @temp_folder).reject { |f| File.directory?(File.join(@temp_folder, f)) }
end
def [](value)

2
lib/theme_store/zip_importer.rb
View File

@ -51,7 +51,7 @@ class ThemeStore::ZipImporter
end
def all_files
Dir.glob("**/**", base: @temp_folder).reject { |f| File.directory?(f) }
Dir.glob("**/**", base: @temp_folder).reject { |f| File.directory?(File.join(@temp_folder, f)) }
end
def [](value)