Commit b19d1bb8 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge remote-tracking branch 'origin/b20' into b20

parents c845d207 bc9a6b0e

module/Indicateur/src/Controller/IndicateurController.php

+4 −1
Original line number Diff line number Diff line
@@ -495,6 +495,7 @@ class IndicateurIntervenantsMailer 
            $message = $this->createMessage($data);

            $message->setTo($email, $name);





            $this->controller->mail()->send($message);

        }

    }
@@ -521,9 +522,11 @@ class IndicateurIntervenantsMailer 
        $body          = new MimeMessage();

        $body->addPart($part);



        $from = (isset($data['from'])) ? $data['from'] : $this->getFrom();



        return (new MailMessage())

            ->setEncoding('UTF-8')

            ->setFrom($this->getFrom(), "Contact Application " . ($app = $this->controller->appInfos()->getNom()))

            ->setFrom($from, "Contact Application " . ($app = $this->controller->appInfos()->getNom()))

            ->setSubject($data['subject'])

            ->setBody($body);

    }

module/Indicateur/view/indicateur/indicateur/envoi-mail-intervenants.phtml

+3 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ echo $this->form()->openTag($this->form->setAttribute('id', 'mail-form')); 


<div class="row">

    <div class="col-md-8">

        <?= $this->formControlGroup($this->form->get('from')->setLabel("Expéditeur du mail")->setAttribute('disabled', 'disabled')) ?>

        <?= $this->formControlGroup($this->form->get('from')->setLabel("Expéditeur du mail")) ?>

    </div>

    <div class="col-md-4">

        <?= $this->formControlGroup($this->form->get('nombre')->setLabel("Nombre de mails à envoyer")->setAttribute('disabled', 'disabled')) ?>
@@ -69,7 +69,8 @@ echo $this->form()->openTag($this->form->setAttribute('id', 'mail-form')); 
     * @param {string} selector

     * @param {object} form

     */

    function installEditor(selector, form) {

    function installEditor(selector, form)

    {

        WidgetInitializer.includeJs(Url('vendor/tinymce-4.4.1/js/tinymce/tinymce.min.js'));

        tinymce.editors = [];

        tinymce.init({