Cadoles
/
ninegate
20
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

conflit

This commit is contained in:
Arnaud Fornerot 2020-02-13 11:21:06 +01:00
parent 90eb93eebe 7440f462ec
commit afaa822d50
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
View File

@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES
(-100, 'Interne', 'SIREN'); (-100, 'Interne', 'SIREN');
INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES 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'); ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple');

2
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Mail/mail.html.twig
View File

@ -41,7 +41,7 @@
closeModal(); closeModal();
{% else %} {% else %}
$("#mail_subject").val("{{ subject }}"); $("#mail_subject").val("{{ subject }}");
$("#mail_message").val("{{ message | raw }}"); CKEDITOR.instances["mail_message"].setData("{{ message | raw }}");
$("#mail_destinataire").focus(); $("#mail_destinataire").focus();
{% endif %} {% endif %}