WIP

Author: yhabteab

application/controllers/UsageController.php

@@ -81,7 +81,7 @@ public function indexAction()
             } else {
                 $this->addControl($searchBar);
                 $this->sendMultipartUpdate();
-                return true;
+                return;
             }
         } else {
             $filter = $searchBar->getFilter();

library/X509/Web/Control/SearchBar/ObjectSuggestions.php

@@ -41,6 +41,13 @@ public function setModel($model): self
         return $this;
     }
 
+    protected function shouldShowRelationFor(string $column): bool
+    {
+        $columns = Str::trimSplit($column, '.');
+
+        return $columns[0] !== $this->model->getTableName();
+    }
+
     protected function createQuickSearchFilter($searchTerm)
     {
         $model = $this->model;
@@ -161,15 +168,21 @@ protected static function collectRelations(Resolver $resolver, Model $subject, a
         foreach ($resolver->getRelations($subject) as $name => $relation) {
             /** @var Relation $relation */
             $isHasOne = $relation instanceof HasOne;
-            if (empty($path)) {
-                $relationPath = [$name];
-                if ($isHasOne && empty($path)) {
+            $relationPath = [$name];
+
+            if (! isset($models[$name]) && ! in_array($name, $path, true)) {
+                if ($isHasOne) {
                     array_unshift($relationPath, $subject->getTableName());
                 }
 
                 $relationPath = array_merge($path, $relationPath);
-                $models[join('.', $relationPath)] = $relation->getTarget();
-                self::collectRelations($resolver, $relation->getTarget(), $models, $relationPath);
+                $targetPath = join('.', $relationPath);
+
+                if (! isset($models[$targetPath])) {
+                    $models[$targetPath] = $relation->getTarget();
+                    self::collectRelations($resolver, $relation->getTarget(), $models, $relationPath);
+                    return;
+                }
             }
         }
     }