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

rename all instances of 'datas' to 'data'

Browse source
This commit is contained in:
osaajani 2021-01-17 03:16:57 +01:00
parent 730ac8963b
commit 61d644c247
48 changed files with 316 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

14
controllers/internals/ConditionalGroup.php
View file

@ -33,7 +33,7 @@ namespace controllers\internals;
];
$internal_ruler = new Ruler();
$valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['datas' => (object) null]]);
$valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['data' => (object) null]]);
if (!$valid_condition)
{
return false;
@ -69,7 +69,7 @@ namespace controllers\internals;
];
$internal_ruler = new Ruler();
$valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['datas' => (object) null]]);
$valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['data' => (object) null]]);
if (!$valid_condition)
{
return false;
@ -112,16 +112,16 @@ namespace controllers\internals;
foreach ($contacts as $key => $contact)
{
$contact['datas'] = json_decode($contact['datas']);
$contact['data'] = json_decode($contact['data']);
$contact = (object) $contact;
//Add metas of contact by adding contact without datas
//Add metas of contact by adding contact without data
$metas = clone $contact;
$metas->datas = null;
$metas->data = null;
$metas->id_user = null;
$datas = ['contact' => $contact->datas, 'contact_metas' => $metas];
$is_valid = $ruler->evaluate_condition($condition, $datas);
$data = ['contact' => $contact->data, 'contact_metas' => $metas];
$is_valid = $ruler->evaluate_condition($condition, $data);
if (!$is_valid)
{
unset($contacts[$key]);