unify suffix guessing

atk4 · Jan 11, 2025 · 8ec0ba0 · 8ec0ba0
1 parent d639bc9
commit 8ec0ba0
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Reference/HasOneSql.php b/src/Reference/HasOneSql.php
@@ -64,6 +64,13 @@ private function _addField(string $fieldName, bool $theirFieldIsTitle, ?string $
         return $fieldExpression;
     }
 
+    private function getLinkNameWithoutReferenceSuffix(): string
+    {
+        $ourModel = $this->getOurModel();
+
+        return preg_replace('~_(' . preg_quote($ourModel->idField, '~') . '|id)$~', '', $this->link);
+    }
+
     private function getOurFieldCaptionWithoutReferenceSuffix(Model $theirModel): string
     {
         $theirField = $theirModel->getField($this->getTheirFieldName($theirModel));
@@ -174,9 +181,7 @@ public function refLink(array $defaults = []): Model
      */
     public function addTitle(array $defaults = []): SqlExpressionField
     {
-        $ourModel = $this->getOurModel();
-
-        $fieldName = $defaults['field'] ?? preg_replace('~_(' . preg_quote($ourModel->idField, '~') . '|id)$~', '', $this->link);
+        $fieldName = $defaults['field'] ?? $this->getLinkNameWithoutReferenceSuffix();
 
         $defaults['ui'] = array_merge(['visible' => true], $defaults['ui'] ?? [], ['editable' => false]);