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

Issue #2774997 by tedbow, tim.plunkett: Make BlockForm extensible

8.2.x
Alex Pott 2016-07-29 12:43:29 +01:00
parent c31a50baa5
commit d2c2e43705
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Language\LanguageManagerInterface; use Drupal\Core\Language\LanguageManagerInterface;
use Drupal\Core\Plugin\ContextAwarePluginInterface; use Drupal\Core\Plugin\ContextAwarePluginInterface;
use Drupal\Core\Plugin\Context\ContextRepositoryInterface; use Drupal\Core\Plugin\Context\ContextRepositoryInterface;
use Drupal\Core\Plugin\PluginWithFormsInterface;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;
/** /**
@ -352,7 +353,30 @@ class BlockForm extends EntityForm {
// Update the original form values. // Update the original form values.
$form_state->setValue('settings', $settings->getValues()); $form_state->setValue('settings', $settings->getValues());
// Submit visibility condition settings. $this->submitVisibility($form, $form_state);
// Save the settings of the plugin.
$entity->save();
drupal_set_message($this->t('The block configuration has been saved.'));
$form_state->setRedirect(
'block.admin_display_theme',
array(
'theme' => $form_state->getValue('theme'),
),
array('query' => array('block-placement' => Html::getClass($this->entity->id())))
);
}
/**
* Helper function to independently submit the visibility UI.
*
* @param array $form
* A nested array form elements comprising the form.
* @param \Drupal\Core\Form\FormStateInterface $form_state
* The current state of the form.
*/
protected function submitVisibility(array $form, FormStateInterface $form_state) {
foreach ($form_state->getValue('visibility') as $condition_id => $values) { foreach ($form_state->getValue('visibility') as $condition_id => $values) {
// Allow the condition to submit the form. // Allow the condition to submit the form.
$condition = $form_state->get(['conditions', $condition_id]); $condition = $form_state->get(['conditions', $condition_id]);
@ -367,20 +391,8 @@ class BlockForm extends EntityForm {
$condition_configuration = $condition->getConfiguration(); $condition_configuration = $condition->getConfiguration();
$form_state->setValue(['visibility', $condition_id], $condition_configuration); $form_state->setValue(['visibility', $condition_id], $condition_configuration);
// Update the visibility conditions on the block. // Update the visibility conditions on the block.
$entity->getVisibilityConditions()->addInstanceId($condition_id, $condition_configuration); $this->entity->getVisibilityConditions()->addInstanceId($condition_id, $condition_configuration);
} }
// Save the settings of the plugin.
$entity->save();
drupal_set_message($this->t('The block configuration has been saved.'));
$form_state->setRedirect(
'block.admin_display_theme',
array(
'theme' => $form_state->getValue('theme'),
),
array('query' => array('block-placement' => Html::getClass($this->entity->id())))
);
} }
/** /**
@ -425,7 +437,10 @@ class BlockForm extends EntityForm {
* The plugin form for the block. * The plugin form for the block.
*/ */
protected function getPluginForm(BlockPluginInterface $block) { protected function getPluginForm(BlockPluginInterface $block) {
return $this->pluginFormFactory->createInstance($block, 'configure'); if ($block instanceof PluginWithFormsInterface) {
return $this->pluginFormFactory->createInstance($block, 'configure');
}
return $block;
} }
} }