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

FIX: json_schemer no longer allows nil keys (#22015)

Browse Source
This commit is contained in:
Daniel Waterworth
2023-06-08 15:12:47 -05:00
committed by GitHub
parent 51672562ec
commit 3d3e8c8fbd
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/theme.rb
View File

@@ -761,12 +761,13 @@ class Theme < ActiveRecord::Base
return if !keys return if !keys
current_values = CSV.parse(setting_row.value, **{ col_sep: "|" }).flatten current_values = CSV.parse(setting_row.value, **{ col_sep: "|" }).flatten
new_values = []
current_values.each do |item| new_values =
parts = CSV.parse(item, **{ col_sep: "," }).flatten current_values.map do |item|
props = parts.map.with_index { |p, idx| [keys[idx], p] }.to_h parts = CSV.parse(item, **{ col_sep: "," }).flatten
new_values << props raise "Schema validation failed" if keys.size < parts.size
end parts.zip(keys).map(&:reverse).to_h
end
schemer = JSONSchemer.schema(schema) schemer = JSONSchemer.schema(schema)
raise "Schema validation failed" if !schemer.valid?(new_values) raise "Schema validation failed" if !schemer.valid?(new_values)