From 7440f462ecc2d9822873e12ea0b4ba6042d06e0c Mon Sep 17 00:00:00 2001 From: afornerot Date: Thu, 13 Feb 2020 11:23:40 +0100 Subject: [PATCH] correction init de la zone messge d'invitation (fixes #86) --- .../CoreBundle/Command/data/core-init-01.sql | 2 +- .../Resources/public/themes/transnum/look.png | Bin 27748 -> 27748 bytes .../public/themes/transnum/transnum-logo.png | Bin 27748 -> 27748 bytes .../Resources/views/Mail/mail.html.twig | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql index 0a16956c..a2830923 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql @@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES (-100, 'DRAAF', '130007107'); INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES -(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}A1vL21ZdkzU1Wf+CScEIZ9VY3560N8Ld +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}BkFFVAICIt3FUlHQLN1FsNWUtsPnLFRs ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png index ef1b8a68c6d5501a7298aeb771667878e226e76e..e0f7c73fc5e1194063cd18940ad6de6a2deafb7b 100644 GIT binary patch delta 25 hcmaEIgYn4?#tm0Yxt=g_ahhl@G8ItSe9yGa3;>hs3LyXh delta 25 hcmaEIgYn4?#tm0YxgK*1b1_)>yft64`JQQ;833993l{(Y diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png index ef1b8a68c6d5501a7298aeb771667878e226e76e..e0f7c73fc5e1194063cd18940ad6de6a2deafb7b 100644 GIT binary patch delta 25 hcmaEIgYn4?#tm0Yxt=g_ahhl@G8ItSe9yGa3;>hs3LyXh delta 25 hcmaEIgYn4?#tm0YxgK*1b1_)>yft64`JQQ;833993l{(Y diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Mail/mail.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Mail/mail.html.twig index 07cfd41f..4a2b7eae 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Mail/mail.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Mail/mail.html.twig @@ -41,7 +41,7 @@ closeModal(); {% else %} $("#mail_subject").val("{{ subject }}"); - $("#mail_message").val("{{ message | raw }}"); + CKEDITOR.instances["mail_message"].setData("{{ message | raw }}"); $("#mail_destinataire").focus(); {% endif %}