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

FIX: Do not error when importing a theme with empty files

Browse Source
This commit is contained in:
David Taylor
2019-04-15 15:46:47 +01:00
parent 6bbdf5b56e
commit 428536788c
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/remote_theme.rb
View File

@ -149,7 +149,7 @@ class RemoteTheme < ActiveRecord::Base
end end
# Destroy fields that no longer exist in the remote theme # Destroy fields that no longer exist in the remote theme
field_ids_to_destroy = theme.theme_fields.pluck(:id) - updated_fields.map(&:id) field_ids_to_destroy = theme.theme_fields.pluck(:id) - updated_fields.map { |tf| tf&.id }
ThemeField.where(id: field_ids_to_destroy).destroy_all ThemeField.where(id: field_ids_to_destroy).destroy_all
if !skip_update if !skip_update

1
spec/models/remote_theme_spec.rb
View File

@ -47,6 +47,7 @@ describe RemoteTheme do
"about.json" => about_json, "about.json" => about_json,
"desktop/desktop.scss" => scss_data, "desktop/desktop.scss" => scss_data,
"scss/file.scss" => ".class1{color:red}", "scss/file.scss" => ".class1{color:red}",
"scss/empty.scss" => "",
"common/header.html" => "I AM HEADER", "common/header.html" => "I AM HEADER",
"common/random.html" => "I AM SILLY", "common/random.html" => "I AM SILLY",
"common/embedded.scss" => "EMBED", "common/embedded.scss" => "EMBED",