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

Issue #2011018 followup by tim.plunkett, andypost: Reconcile entity forms and confirm forms.

8.0.x
Alex Pott 2013-06-19 11:25:38 +02:00
parent 270db4a504
commit fd5f765f76
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
View File

@ -22,6 +22,13 @@ abstract class EntityConfirmFormBase extends EntityFormController implements Con
*/ */
protected $request; protected $request;
/**
* {@inheritdoc}
*/
public function getBaseFormID() {
return $this->entity->entityType() . '_confirm_form';
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */

7
core/lib/Drupal/Core/Entity/EntityNGConfirmFormBase.php
View File

@ -22,6 +22,13 @@ abstract class EntityNGConfirmFormBase extends EntityFormControllerNG implements
*/ */
protected $request; protected $request;
/**
* {@inheritdoc}
*/
public function getBaseFormID() {
return $this->entity->entityType() . '_confirm_form';
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */

5
core/modules/node/node.module
View File

@ -1919,11 +1919,6 @@ function theme_node_recent_content($variables) {
* Adds node-type specific visibility options to block configuration form. * Adds node-type specific visibility options to block configuration form.
*/ */
function node_form_block_form_alter(&$form, &$form_state) { function node_form_block_form_alter(&$form, &$form_state) {
// These options should be added to most block forms, but not when deleting.
if ($form_state['controller']->getOperation() == 'delete') {
return;
}
$block = $form_state['controller']->getEntity(); $block = $form_state['controller']->getEntity();
$visibility = $block->get('visibility'); $visibility = $block->get('visibility');
$form['visibility']['node_type'] = array( $form['visibility']['node_type'] = array(