Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3301663 by catch, Berdir, lucassc: Remove handling of node_type condition plugin in BlockForm::\Drupal\block\BlockForm::buildVisibilityInterface()

merge-requests/2631/head
Alex Pott 2022-08-10 16:59:14 +01:00
parent f2c6592768
commit 61e1feccf8
No known key found for this signature in database
GPG Key ID: BDA67E7EE836E5CE
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/modules/block/src/BlockForm.php
View File

@ -237,15 +237,6 @@ class BlockForm extends EntityForm {
continue;
}
// Don't display the deprecated node type condition unless it has existing
// settings.
// @todo Make this more generic in
// https://www.drupal.org/project/drupal/issues/2922451. Also remove
// the node_type specific logic below.
if ($condition_id == 'node_type' && !isset($visibility[$condition_id])) {
continue;
}
/** @var \Drupal\Core\Condition\ConditionInterface $condition */
$condition = $this->manager->createInstance($condition_id, $visibility[$condition_id] ?? []);
$form_state->set(['conditions', $condition_id], $condition);
@ -256,13 +247,6 @@ class BlockForm extends EntityForm {
$form[$condition_id] = $condition_form;
}
if (isset($form['node_type'])) {
$form['node_type']['#title'] = $this->t('Content types (deprecated)');
$form['node_type']['bundles']['#title'] = $this->t('Content types');
$form['node_type']['negate']['#type'] = 'value';
$form['node_type']['negate']['#title_display'] = 'invisible';
$form['node_type']['negate']['#value'] = $form['node_type']['negate']['#default_value'];
}
if (isset($form['entity_bundle:node'])) {
$form['entity_bundle:node']['negate']['#type'] = 'value';
$form['entity_bundle:node']['negate']['#title_display'] = 'invisible';