improve

atk4 · Jan 12, 2025 · 865ff24 · 865ff24
1 parent 8ec0ba0
commit 865ff24
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Reference/HasOneSql.php b/src/Reference/HasOneSql.php
@@ -64,7 +64,7 @@ private function _addField(string $fieldName, bool $theirFieldIsTitle, ?string $
         return $fieldExpression;
     }
 
-    private function getLinkNameWithoutReferenceSuffix(): string
+    private function getLinkNameWithoutIdSuffix(): string
     {
         $ourModel = $this->getOurModel();
 
@@ -73,9 +73,10 @@ private function getLinkNameWithoutReferenceSuffix(): string
 
     private function getOurFieldCaptionWithoutReferenceSuffix(Model $theirModel): string
     {
+        $ourModel = $this->getOurModel();
         $theirField = $theirModel->getField($this->getTheirFieldName($theirModel));
 
-        return preg_replace('~ (' . preg_quote($theirField->getCaption(), '~') . '|ID)$~i', '', $this->getOurField()->getCaption());
+        return preg_replace('~ (' . preg_quote($theirField->getCaption(), '~') . '|' . preg_quote($ourModel->getIdField()->getCaption(), '~') . '|ID)$~i', '', $this->getOurField()->getCaption());
     }
 
     /**
@@ -181,7 +182,7 @@ public function refLink(array $defaults = []): Model
      */
     public function addTitle(array $defaults = []): SqlExpressionField
     {
-        $fieldName = $defaults['field'] ?? $this->getLinkNameWithoutReferenceSuffix();
+        $fieldName = $defaults['field'] ?? $this->getLinkNameWithoutIdSuffix();
 
         $defaults['ui'] = array_merge(['visible' => true], $defaults['ui'] ?? [], ['editable' => false]);