Commit 86cd5bca authored by Wayne Eaker's avatar Wayne Eaker Committed by Wayne Eaker
Browse files

Issue #3127018 by zengenuity, ridhimaabrol24: Drupal 9 compatibility

parent 0f10e87f

easy_email.info.yml

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ name: Easy Email 
type: module

description: A simple system for sending HTML-formatted emails

package: Mail

core: 8.x

core_version_requirement: ^8.8 || ^9

configure: entity.easy_email_type.collection



dependencies:

modules/easy_email_override/easy_email_override.info.yml

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ name: Easy Email Overrides 
type: module

description: Provides a system for overridding emails from core and contrib modules with emais generated from Easy Email templates.

package: Mail

core: 8.x

core_version_requirement: ^8.8 || ^9

configure: entity.easy_email_override.collection



dependencies:

modules/easy_email_override/src/Form/EmailOverrideForm.php

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ class EmailOverrideForm extends EntityForm { 
    $possible_mappings = [];



    $easy_email_fields = [];

    $field_definitions = \Drupal::entityManager()->getFieldDefinitions('easy_email', $easy_email_type);

    $field_definitions = \Drupal::entityTypeManager()->getFieldDefinitions('easy_email', $easy_email_type);

    foreach ($field_definitions as $field_name => $definition) {

      $field_info = [

        'label' => $definition->getLabel(),

src/Controller/EasyEmailController.php

+8 −7
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use Drupal\Core\Controller\ControllerBase; 
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;

use Drupal\Core\Form\FormBuilderInterface;

use Drupal\Core\Form\FormState;

use Drupal\Core\Link;

use Drupal\Core\Url;

use Drupal\easy_email\Entity\EasyEmailInterface;

use Drupal\easy_email\Entity\EasyEmailTypeInterface;
@@ -146,8 +147,8 @@ class EasyEmailController extends ControllerBase implements ContainerInjectionIn 
   *   An array suitable for drupal_render().

   */

  public function revisionShow($easy_email_revision) {

    $easy_email = $this->entityManager()->getStorage('easy_email')->loadRevision($easy_email_revision);

    $view_builder = $this->entityManager()->getViewBuilder('easy_email');

    $easy_email = $this->entityTypeManager()->getStorage('easy_email')->loadRevision($easy_email_revision);

    $view_builder = $this->entityTypeManager()->getViewBuilder('easy_email');



    return $view_builder->view($easy_email);

  }
@@ -162,8 +163,8 @@ class EasyEmailController extends ControllerBase implements ContainerInjectionIn 
   *   The page title.

   */

  public function revisionPageTitle($easy_email_revision) {

    $easy_email = $this->entityManager()->getStorage('easy_email')->loadRevision($easy_email_revision);

    return $this->t('Revision of %title from %date', ['%title' => $easy_email->label(), '%date' => format_date($easy_email->getRevisionCreationTime())]);

    $easy_email = $this->entityTypeManager()->getStorage('easy_email')->loadRevision($easy_email_revision);

    return $this->t('Revision of %title from %date', ['%title' => $easy_email->label(), '%date' => \Drupal::service('date.formatter')->format($easy_email->getRevisionCreationTime())]);

  }



  /**
@@ -181,7 +182,7 @@ class EasyEmailController extends ControllerBase implements ContainerInjectionIn 
    $langname = $easy_email->language()->getName();

    $languages = $easy_email->getTranslationLanguages();

    $has_translations = (count($languages) > 1);

    $easy_email_storage = $this->entityManager()->getStorage('easy_email');

    $easy_email_storage = $this->entityTypeManager()->getStorage('easy_email');



    $build['#title'] = $has_translations ? $this->t('@langname revisions for %title', ['@langname' => $langname, '%title' => $easy_email->label()]) : $this->t('Revisions for %title', ['%title' => $easy_email->label()]);

    $header = [$this->t('Revision'), $this->t('Operations')];
@@ -209,10 +210,10 @@ class EasyEmailController extends ControllerBase implements ContainerInjectionIn 
        // Use revision link to link to revisions that are not active.

        $date = \Drupal::service('date.formatter')->format($revision->getRevisionCreationTime(), 'short');

        if ($vid != $easy_email->getRevisionId()) {

          $link = $this->l($date, new Url('entity.easy_email.revision', ['easy_email' => $easy_email->id(), 'easy_email_revision' => $vid]));

          $link = Link::fromTextAndUrl($date, Url::fromRoute('entity.easy_email.revision', ['easy_email' => $easy_email->id(), 'easy_email_revision' => $vid]));

        }

        else {

          $link = $easy_email->link($date);

          $link = $easy_email->tolink($date)->toString();

        }



        $row = [];

src/Form/EasyEmailForm.php

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ class EasyEmailForm extends ContentEntityForm { 
      $entity->setNewRevision();



      // If a new revision is created, save the current user as revision author.

      $entity->setRevisionCreationTime(REQUEST_TIME);

      $entity->setRevisionCreationTime(\Drupal::time()->getRequestTime());

      $entity->setRevisionUserId(\Drupal::currentUser()->id());

    }

    else {