From 909b3297489366646659c3388dcf94860b434398 Mon Sep 17 00:00:00 2001
From: mscherer <dereuromark@web.de>
Date: Thu, 13 Nov 2025 06:04:56 +0100
Subject: [PATCH] Remove ID on related data.

---
 src/Utility/Model/AssociationFilter.php     | 3 ++-
 tests/comparisons/Template/testBakeView.php | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Utility/Model/AssociationFilter.php b/src/Utility/Model/AssociationFilter.php
index c6f6a47c5..3ed039321 100644
--- a/src/Utility/Model/AssociationFilter.php
+++ b/src/Utility/Model/AssociationFilter.php
@@ -93,6 +93,7 @@ public function filterAssociations(Table $model): array
                 }
 
                 try {
+                    $foreignKey = (array)$assoc->getForeignKey();
                     $associations[$type][$assocName] = [
                         'property' => $assoc->getProperty(),
                         'variable' => Inflector::variable($assocName),
@@ -101,7 +102,7 @@ public function filterAssociations(Table $model): array
                         'foreignKey' => $assoc->getForeignKey(),
                         'alias' => $alias,
                         'controller' => $className,
-                        'fields' => $target->getSchema()->columns(),
+                        'fields' => array_values(array_diff($target->getSchema()->columns(), $foreignKey)),
                         'navLink' => $navLink,
                     ];
                 } catch (Exception $e) {
diff --git a/tests/comparisons/Template/testBakeView.php b/tests/comparisons/Template/testBakeView.php
index d6a8388d6..260063c09 100644
--- a/tests/comparisons/Template/testBakeView.php
+++ b/tests/comparisons/Template/testBakeView.php
@@ -68,7 +68,6 @@
                     <table>
                         <tr>
                             <th><?= __('Id') ?></th>
-                            <th><?= __('Author Id') ?></th>
                             <th><?= __('Title') ?></th>
                             <th><?= __('Body') ?></th>
                             <th><?= __('Published') ?></th>
@@ -77,7 +76,6 @@
                         <?php foreach ($author->articles as $article) : ?>
                         <tr>
                             <td><?= h($article->id) ?></td>
-                            <td><?= h($article->author_id) ?></td>
                             <td><?= h($article->title) ?></td>
                             <td><?= h($article->body) ?></td>
                             <td><?= h($article->published) ?></td>