diff options
| -rw-r--r-- | app/Http/Controllers/ListController.php | 2 | ||||
| -rw-r--r-- | app/Http/RequestHandlers/FamilyPage.php | 16 | ||||
| -rw-r--r-- | resources/views/family-page.phtml | 2 |
3 files changed, 15 insertions, 5 deletions
diff --git a/app/Http/Controllers/ListController.php b/app/Http/Controllers/ListController.php index 7dec1520f9..7e2ce3bfa6 100644 --- a/app/Http/Controllers/ListController.php +++ b/app/Http/Controllers/ListController.php @@ -632,7 +632,7 @@ class ListController extends AbstractBaseController ->where('multimedia_file_refn', 'NOT LIKE', 'https:%'); if ($subfolders === 'exclude') { - $query->where('multimedia_file_refn', 'NOT LIKE', $folder .'/%/%'); + $query->where('multimedia_file_refn', 'NOT LIKE', $folder . '/%/%'); } } diff --git a/app/Http/RequestHandlers/FamilyPage.php b/app/Http/RequestHandlers/FamilyPage.php index e18ad63944..c913c5ebb0 100644 --- a/app/Http/RequestHandlers/FamilyPage.php +++ b/app/Http/RequestHandlers/FamilyPage.php @@ -21,8 +21,10 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fig\Http\Message\StatusCodeInterface; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Http\ViewResponseTrait; +use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Services\ClipboardService; use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; @@ -32,6 +34,8 @@ use Psr\Http\Server\RequestHandlerInterface; use stdClass; use function assert; +use function explode; +use function in_array; use function is_string; use function redirect; @@ -78,9 +82,14 @@ class FamilyPage implements RequestHandlerInterface $clipboard_facts = $this->clipboard_service->pastableFacts($family, new Collection()); + $facts = $family->facts([], true) + ->filter(static function (Fact $fact): bool { + return !in_array($fact->getTag(), ['HUSB', 'WIFE', 'CHIL'], true); + }); + return $this->viewResponse('family-page', [ 'clipboard_facts' => $clipboard_facts, - 'facts' => $family->facts([], true), + 'facts' => $facts, 'meta_description' => '', 'meta_robots' => 'index,follow', 'record' => $family, @@ -106,10 +115,11 @@ class FamilyPage implements RequestHandlerInterface 'surname' => '', ]; - foreach ($family->spouses()->merge($family->children()) as $individual) { + $individual = $family->spouses()->merge($family->children())->first(); + + if ($individual instanceof Individual) { $significant->individual = $individual; [$significant->surname] = explode(',', $individual->sortName()); - break; } return $significant; diff --git a/resources/views/family-page.phtml b/resources/views/family-page.phtml index 0b1e92bad3..79b31d5dfd 100644 --- a/resources/views/family-page.phtml +++ b/resources/views/family-page.phtml @@ -52,7 +52,7 @@ use Fisharebest\Webtrees\View; <table class="table wt-facts-table"> <?php if ($facts->isEmpty()) : ?> <tr> - <td class="messagebox" colspan="2"> + <td colspan="2"> <?= I18N::translate('No facts exist for this family.') ?> </td> </tr> |