From 4e019a7e845ebb5d99d1c27ae1f3fcffd56276e2 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Fri, 17 Apr 2020 13:40:18 +0300 Subject: [PATCH] fix formula find related one filter --- .../Core/Formula/Functions/RecordGroup/FindRelatedOneType.php | 2 +- tests/integration/Espo/Core/Formula/FormulaTest.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedOneType.php b/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedOneType.php index dda25ad6db..3ad7452dbd 100644 --- a/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedOneType.php +++ b/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedOneType.php @@ -121,7 +121,7 @@ class FindRelatedOneType extends \Espo\Core\Formula\Functions\Base if (count($item->value) <= 6) { $filter = null; if (count($item->value) == 6) { - $filter = $this->evaluate($item->value[3]); + $filter = $this->evaluate($item->value[5]); } if ($filter) { if (!is_string($filter)) throw new Error("Formula record\\findRelatedOne: Bad filter."); diff --git a/tests/integration/Espo/Core/Formula/FormulaTest.php b/tests/integration/Espo/Core/Formula/FormulaTest.php index ec75dcd8d7..470aef80ba 100644 --- a/tests/integration/Espo/Core/Formula/FormulaTest.php +++ b/tests/integration/Espo/Core/Formula/FormulaTest.php @@ -296,6 +296,10 @@ class FormulaTest extends \tests\integration\Core\BaseTestCase $result = $fm->run($script); $this->assertEquals($m4->id, $result); + $script = "record\\findRelatedOne('Account', '".$account->id."', 'meetings', 'name', 'desc', 'held')"; + $result = $fm->run($script); + $this->assertEquals($m3->id, $result); + $script = "record\\findRelatedOne('Account', '".$account->id."', 'meetings', 'name', 'desc', 'status', 'Held')"; $result = $fm->run($script); $this->assertEquals($m3->id, $result);