Fix: #2316 - same name shown twice in autocomplete

fisharebest · Mar 19, 2019 · bc870f7 · bc870f7
1 parent 55dc282
commit bc870f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/Individual.php b/app/Individual.php
@@ -53,7 +53,10 @@ public static function rowMapper(): Closure
             $individual = Individual::getInstance($row->i_id, Tree::findById((int) $row->i_file), $row->i_gedcom);
 
             if ($row->n_num ?? null) {
+                $individual = clone $individual;
                 $individual->setPrimaryName($row->n_num);
+
+                return $individual;
             }
 
             return $individual;

diff --git a/app/Services/SearchService.php b/app/Services/SearchService.php
@@ -151,8 +151,7 @@ public function searchIndividualNames(array $trees, array $search, int $offset =
                     ->on('name.n_id', '=', 'individuals.i_id');
             })
             ->orderBy('n_sort')
-            ->select(['individuals.*', 'n_sort', 'n_num'])
-            ->distinct();
+            ->select(['individuals.*', 'n_num']);
 
         $this->whereTrees($query, 'i_file', $trees);
         $this->whereSearch($query, 'n_full', $search);
@@ -875,6 +874,7 @@ private function paginateQuery(Builder $query, Closure $row_mapper, Closure $row
             }
         }
 
+
         return $collection;
     }