Mascali/raspisms
1
0
Fork 0
mirror of https://github.com/RaspbianFrance/raspisms.git synced 2025-04-21 08:56:27 +02:00
Code Issues Projects Releases Wiki Activity

Update templating and conditional groups to add contact_metas

Browse source
This commit is contained in:
osaajani 2020-09-26 21:34:42 +02:00
parent 6062446027
commit 8d86f576d8
4 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
controllers/publics/ConditionalGroup.php
View file

@ -213,7 +213,7 @@ namespace controllers\publics;
}
$internal_ruler = new \controllers\internals\Ruler();
$valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['datas' => (object) null]]);
$valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['datas' => (object) null], 'contact_metas' => (object) null]);
if (!$valid_condition)
{
$return['result'] = 'Syntaxe de la condition invalide.';

6
controllers/publics/Templating.php
View file

@ -68,8 +68,14 @@ namespace controllers\publics;
$contact['datas'] = json_decode($contact['datas'], true);
//Add metas of contact by adding contact without datas
$metas = $contact;
unset($metas['datas']);
unset($metas['id_user']);
$datas = [
'contact' => $contact['datas'],
'contact_metas' => $metas,
];
$result = $this->internal_templating->render($template, $datas);