hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

deep merge in config update

Browse source
This commit is contained in:
Alexander Strizhakov 2020-01-06 14:05:32 +03:00
commit 88a16bb9fc
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
3 changed files with 71 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/admin_api/config.ex
View file

@ -81,7 +81,7 @@ defmodule Pleroma.Web.AdminAPI.Config do
old_value <- from_binary(config.value),
transformed_value <- do_transform(params[:value]),
{:can_be_merged, true, config} <- {:can_be_merged, is_list(transformed_value), config},
new_value <- Keyword.merge(old_value, transformed_value) do
new_value <- DeepMerge.deep_merge(old_value, transformed_value) do
Config.update(config, %{value: new_value, transformed?: true})
else
{reason, false, config} when reason in [:partial_update, :can_be_merged] ->