diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2021-02-01 16:50:30 +0000 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2021-02-02 16:52:32 +0000 |
| commit | c2ed51d13a57743094c11c8fe84befd9d4f158cd (patch) | |
| tree | 4f2d541fed3550f5d64f9754e9d37f5e9b9ce447 /resources/views/edit/reorder-families.phtml | |
| parent | 4d2b9c53c95ad846160295dd8f4136a5b53f9f7b (diff) | |
| download | webtrees-c2ed51d13a57743094c11c8fe84befd9d4f158cd.tar.gz webtrees-c2ed51d13a57743094c11c8fe84befd9d4f158cd.tar.bz2 webtrees-c2ed51d13a57743094c11c8fe84befd9d4f158cd.zip | |
Merge GEDCOM element code from 2.1 branch
Diffstat (limited to 'resources/views/edit/reorder-families.phtml')
| -rw-r--r-- | resources/views/edit/reorder-families.phtml | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/resources/views/edit/reorder-families.phtml b/resources/views/edit/reorder-families.phtml index c8af622a32..10a3364598 100644 --- a/resources/views/edit/reorder-families.phtml +++ b/resources/views/edit/reorder-families.phtml @@ -1,10 +1,22 @@ <?php +use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Gedcom; -use Fisharebest\Webtrees\GedcomCode\GedcomCodePedi; use Fisharebest\Webtrees\Http\RequestHandlers\ReorderFamiliesAction; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Registry; +use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\View; +use Illuminate\Support\Collection; + +/** + * @var Collection<Fact> $famc_facts + * @var Collection<Fact> $fams_facts + * @var Individual $individual + * @var string $title + * @var Tree $tree + */ ?> @@ -70,7 +82,7 @@ use Fisharebest\Webtrees\View; <div class="card my-2 wt-sortable-item" data-sortbydate="<?= $fact->target()->getMarriageDate()->julianDay() ?>"> <input type="hidden" name="order[]" value="<?= $fact->id() ?>"> <div class="card-header"> - <?= view('edit/reorder-card-header', ['title' => $fact->target()->fullName() . ($fact->attribute('PEDI') === '' ? '' : ' — ' . GedcomCodePedi::getValue($fact->attribute('PEDI'), $individual))]) ?> + <?= view('edit/reorder-card-header', ['title' => $fact->target()->fullName() . ($fact->attribute('PEDI') === '' ? '' : ' — ' . Registry::elementFactory()->make('INDI:FAMC:PEDI')->value($fact->attribute('PEDI'), $tree))]) ?> </div> <div class="card-body"> <?= $fact->target()->formatFirstMajorFact(Gedcom::MARRIAGE_EVENTS, 2) ?> |