mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-11-16 10:33:00 +03:00
Merge remote-tracking branch 'upstream/dev' into feature/share-review-timestamp
This commit is contained in:
@@ -649,8 +649,11 @@ const mergeSectionConfig = (
|
||||
return srcValue ?? objValue;
|
||||
}
|
||||
|
||||
if (key === "uiSchema" && srcValue !== undefined) {
|
||||
return srcValue;
|
||||
if (key === "uiSchema") {
|
||||
if (objValue && srcValue) {
|
||||
return merge({}, objValue, srcValue);
|
||||
}
|
||||
return srcValue ?? objValue;
|
||||
}
|
||||
|
||||
return undefined;
|
||||
|
||||
Reference in New Issue
Block a user