From c791cc2d5a5b3641768c168ce51f9217a6892c11 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 8 Jan 2015 19:37:59 +0000
Subject: [PATCH] Issue #2397807 by yched: EntityDisplay schema for
third_party_settings is wrong
---
core/config/schema/core.entity.schema.yml | 18 +++++++++---------
.../config/schema/field_test.schema.yml | 3 ++-
.../schema/field_third_party_test.schema.yml | 8 ++++----
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/core/config/schema/core.entity.schema.yml b/core/config/schema/core.entity.schema.yml
index 8de3f33ca38d..aab3c1a8b35a 100644
--- a/core/config/schema/core.entity.schema.yml
+++ b/core/config/schema/core.entity.schema.yml
@@ -79,17 +79,17 @@ core.entity_view_display.*.*.*:
weight:
type: integer
label: 'Weight'
- third_party_settings:
- type: sequence
- label: 'Third party settings'
- sequence:
- - type: entity_view_display.third_party.[%key]
label:
type: string
label: 'Label setting machine name'
settings:
type: field.formatter.settings.[%parent.type]
label: 'Settings'
+ third_party_settings:
+ type: sequence
+ label: 'Third party settings'
+ sequence:
+ - type: field.formatter.third_party.[%key]
hidden:
type: sequence
label: 'Field display setting'
@@ -135,14 +135,14 @@ core.entity_form_display.*.*.*:
weight:
type: integer
label: 'Weight'
+ settings:
+ type: field.widget.settings.[%parent.type]
+ label: 'Settings'
third_party_settings:
type: sequence
label: 'Third party settings'
sequence:
- - type: entity_form_display.third_party.[%key]
- settings:
- type: field.widget.settings.[%parent.type]
- label: 'Settings'
+ - type: field.widget.third_party.[%key]
hidden:
type: sequence
label: 'Hidden'
diff --git a/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml b/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml
index 0ff333e425d3..647ae1389e9d 100644
--- a/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml
+++ b/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml
@@ -95,7 +95,8 @@ field.value.test_field:
type: label
label: 'Value'
-entity_view_display.third_party.field_test:
+
+field.formatter.third_party.field_test:
type: mapping
label: 'Field test entity display third party setting'
mapping:
diff --git a/core/modules/field/tests/modules/field_third_party_test/config/schema/field_third_party_test.schema.yml b/core/modules/field/tests/modules/field_third_party_test/config/schema/field_third_party_test.schema.yml
index c177f4404ef1..15d643a7023c 100644
--- a/core/modules/field/tests/modules/field_third_party_test/config/schema/field_third_party_test.schema.yml
+++ b/core/modules/field/tests/modules/field_third_party_test/config/schema/field_third_party_test.schema.yml
@@ -1,14 +1,14 @@
-entity_view_display.third_party.field_third_party_test:
+field.formatter.third_party.field_third_party_test:
type: mapping
- label: 'field_third_party_test entity display settings'
+ label: 'field_third_party_test third party formatter settings'
mapping:
field_test_field_formatter_third_party_settings_form:
type: string
label: field_test_field_formatter_third_party_settings_form
-entity_form_display.third_party.field_third_party_test:
+field.widget.third_party.field_third_party_test:
type: mapping
- label: 'field_third_party_test entity form display settings'
+ label: 'field_third_party_test third party widget settings'
mapping:
field_test_widget_third_party_settings_form:
type: string
--
GitLab