Commit fd5f765f authored by alexpott's avatar alexpott

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

parent 270db4a5
......@@ -22,6 +22,13 @@ abstract class EntityConfirmFormBase extends EntityFormController implements Con
*/
protected $request;
/**
* {@inheritdoc}
*/
public function getBaseFormID() {
return $this->entity->entityType() . '_confirm_form';
}
/**
* {@inheritdoc}
*/
......
......@@ -22,6 +22,13 @@ abstract class EntityNGConfirmFormBase extends EntityFormControllerNG implements
*/
protected $request;
/**
* {@inheritdoc}
*/
public function getBaseFormID() {
return $this->entity->entityType() . '_confirm_form';
}
/**
* {@inheritdoc}
*/
......
......@@ -1919,11 +1919,6 @@ function theme_node_recent_content($variables) {
* Adds node-type specific visibility options to block configuration form.
*/
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();
$visibility = $block->get('visibility');
$form['visibility']['node_type'] = array(
......
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