Commit a542a43c authored by alexpott's avatar alexpott

Issue #2392263 by Gábor Hojtsy: Sequence subtyping cannot override item type...

Issue #2392263 by Gábor Hojtsy: Sequence subtyping cannot override item type in config schema, views taxonomy term filter schema incorrect
parent 942df46a
......@@ -130,7 +130,9 @@ public function getDefinition($base_plugin_id, $exception_on_invalid = TRUE) {
// Check whether this type is an extension of another one and compile it.
if (isset($definition['type'])) {
$merge = $this->getDefinition($definition['type'], $exception_on_invalid);
$definition = NestedArray::mergeDeep($merge, $definition);
// Preserve integer keys on merge, so sequence item types can override
// parent settings as opposed to adding unused second, third, etc. items.
$definition = NestedArray::mergeDeepArray(array($merge, $definition), TRUE);
// Unset type so we try the merge only once per type.
unset($definition['type']);
$this->definitions[$type] = $definition;
......
......@@ -148,29 +148,17 @@ views.filter.taxonomy_index_tid:
error_message:
type: boolean
label: 'Display error message'
views.filter.taxonomy_index_tid_depth:
type: views.filter.in_operator
label: 'Taxonomy term ID with depth'
mapping:
operator:
type: string
label: 'Operator'
value:
type: sequence
label: 'Values'
sequence:
- type: string
- type: integer
label: 'Value'
vid:
type: string
label: 'Vocabulary'
type:
type: string
label: 'Selection type'
hierarchy:
type: boolean
label: 'Show hierarchy in dropdown'
views.filter.taxonomy_index_tid_depth:
type: views.filter.taxonomy_index_tid
label: 'Taxonomy term ID with depth'
mapping:
depth:
type: integer
label: 'Depth'
......
......@@ -136,7 +136,7 @@ display:
admin_label: ''
operator: or
value:
- '2'
- 2
group: 1
exposed: false
expose:
......
......@@ -101,18 +101,9 @@ views.filter.many_to_one:
type: views.filter.in_operator
label: 'Many to one'
mapping:
operator:
type: string
label: 'Operator'
reduce_duplicates:
type: boolean
label: 'Reduce duplicate'
value:
type: sequence
label: 'Values'
sequence:
- type: string
label: 'Value'
views.filter.standard:
type: views_filter
......@@ -140,7 +131,3 @@ views.filter_value.combine:
views.filter.language:
type: views.filter.in_operator
label: 'Language'
views.filter_value.language:
type: string
label: 'Language'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment