From 1aa306375f2730b210481324104ec4f611a7288e Mon Sep 17 00:00:00 2001 From: Andreas Schempp Date: Fri, 27 Sep 2024 16:30:12 +0200 Subject: [PATCH] Prefer label over value in the backed lead list --- src/EventListener/DataContainer/LeadLabelListener.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/EventListener/DataContainer/LeadLabelListener.php b/src/EventListener/DataContainer/LeadLabelListener.php index 6c98c9a..30f4d08 100644 --- a/src/EventListener/DataContainer/LeadLabelListener.php +++ b/src/EventListener/DataContainer/LeadLabelListener.php @@ -45,13 +45,13 @@ public function __invoke(array $row, string $label): string '_member' => $this->formatToken($lead['member_name'], $row['member_id']), ]; - $values = $this->connection->fetchAllKeyValue('SELECT name, value FROM tl_lead_data WHERE pid=?', [$row['id']]); + $records = $this->connection->fetchAllAssociative('SELECT name, value, label FROM tl_lead_data WHERE pid=?', [$row['id']]); - foreach ($values as $name => $value) { + foreach ($records as $record) { if ($this->stringParser) { - $this->stringParser->flatten(StringUtil::deserialize($value), $name, $tokens); + $this->stringParser->flatten(StringUtil::deserialize($record['label'] ?: $record['value']), $record['name'], $tokens); } else { - \Haste\Util\StringUtil::flatten(StringUtil::deserialize($value), $name, $tokens); + \Haste\Util\StringUtil::flatten(StringUtil::deserialize($record['label'] ?: $record['value']), $record['name'], $tokens); } }