Commit 53f367a6 authored by Travis Tomka's avatar Travis Tomka Committed by Travis Tomka
Browse files

Issue #3261643 by droath, galactus86: Condition DataTypes - blank

parent 99cfd04b

src/Form/NotificationMessageForm.php

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ use Drupal\Core\Entity\ContentEntityForm; 
use Drupal\Core\Form\FormStateInterface;

use Drupal\Core\Form\SubformState;

use Drupal\Core\Plugin\Context\Context;

use Drupal\Core\Plugin\Context\ContextDefinition;

use Drupal\Core\Plugin\Context\EntityContextDefinition;

use Drupal\notification_message\Entity\NotificationMessageType;



/**
@@ -231,7 +231,7 @@ class NotificationMessageForm extends ContentEntityForm { 
    $bundle_entity = $this->entity->getBundleEntityTypeEntity();

    assert($bundle_entity instanceof NotificationMessageType);

    foreach ($bundle_entity->getConditionDatatype() as $data_type) {

      $contexts[] = new Context(new ContextDefinition($data_type));

      $contexts[] = new Context(new EntityContextDefinition($data_type));

    }



    return $contexts;

src/Form/NotificationMessageTypeForm.php

+2 −2
Original line number Diff line number Diff line
@@ -137,10 +137,10 @@ class NotificationMessageTypeForm extends BundleEntityFormBase { 
    $options = [];



    foreach ($this->conditionManager->getDefinitions() as $condition) {

      if (!isset($condition['context'])) {

      if (!isset($condition['context_definitions'])) {

        continue;

      }

      foreach ($condition['context'] as $context) {

      foreach ($condition['context_definitions'] as $context) {

        assert($context instanceof ContextDefinitionInterface);

        if (!$context->isRequired()) {

          continue;