Commit fbe5af7b authored by Jeroen Tubex's avatar Jeroen Tubex
Browse files

Issue #3252631 by JeroenT, perfectcu.be: Call to a member function getFormId()...

Issue #3252631 by JeroenT, perfectcu.be: Call to a member function getFormId() on null in disable_field.module on line 55
parent 920487d9
Loading
Loading
Loading
Loading
+9 −3
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@

use Drupal\Core\Config\Entity\ThirdPartySettingsInterface;
use Drupal\Core\Entity\EntityFormInterface;
use Drupal\Core\Form\FormInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Routing\RouteMatchInterface;

@@ -46,13 +47,18 @@ function disable_field_form_base_field_override_edit_form_alter(array &$form, Fo
 * Implements hook_field_widget_multivalue_form_alter().
 */
function disable_field_field_widget_multivalue_form_alter(array &$elements, FormStateInterface $form_state, array $context) {
  $form_object = $form_state->getFormObject();
  if (!$form_object instanceof FormInterface) {
    return;
  }

  // Don't disable fields on the field config edit form.
  if ($form_state->getFormObject()->getFormId() === 'field_config_edit_form') {
  if ($form_object->getFormId() === 'field_config_edit_form') {
    return;
  }

  // Don't disable fields when we're not on an entity form.
  if (!$form_state->getFormObject() instanceof EntityFormInterface) {
  if (!$form_object instanceof EntityFormInterface) {
    return;
  }

@@ -63,7 +69,7 @@ function disable_field_field_widget_multivalue_form_alter(array &$elements, Form

  $user_roles = \Drupal::currentUser()->getRoles();
  $disable_field = $context['items']->getFieldDefinition()->getThirdPartySettings('disable_field');
  $entity = $form_state->getFormObject()->getEntity();
  $entity = $form_object->getEntity();
  $operation = $entity->id() ? 'edit' : 'add';

  if (empty($disable_field["{$operation}_disable"])) {