diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2018-11-11 06:25:19 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2018-11-18 09:14:42 +0000 |
| commit | e7766c081c2e7ece562ab624d78f341efea2ba24 (patch) | |
| tree | 29c2467c263c265fcbf00d8a54abeba6d361fcc5 /resources/views | |
| parent | 6b5586363e920c099d99ffacb831054d895e4ed3 (diff) | |
| download | webtrees-e7766c081c2e7ece562ab624d78f341efea2ba24.tar.gz webtrees-e7766c081c2e7ece562ab624d78f341efea2ba24.tar.bz2 webtrees-e7766c081c2e7ece562ab624d78f341efea2ba24.zip | |
Rename Fact::getParent() to record()
Diffstat (limited to 'resources/views')
| -rw-r--r-- | resources/views/edit/raw-gedcom-fact.phtml | 6 | ||||
| -rw-r--r-- | resources/views/edit/reorder-names.phtml | 2 | ||||
| -rw-r--r-- | resources/views/modules/todays_events/list.phtml | 2 | ||||
| -rw-r--r-- | resources/views/modules/todays_events/table.phtml | 2 | ||||
| -rw-r--r-- | resources/views/modules/todo/research-tasks.phtml | 6 | ||||
| -rw-r--r-- | resources/views/modules/upcoming_events/list.phtml | 2 | ||||
| -rw-r--r-- | resources/views/modules/upcoming_events/table.phtml | 2 | ||||
| -rw-r--r-- | resources/views/timeline-chart.phtml | 14 |
8 files changed, 18 insertions, 18 deletions
diff --git a/resources/views/edit/raw-gedcom-fact.phtml b/resources/views/edit/raw-gedcom-fact.phtml index e040dbbfd9..839a24e847 100644 --- a/resources/views/edit/raw-gedcom-fact.phtml +++ b/resources/views/edit/raw-gedcom-fact.phtml @@ -5,8 +5,8 @@ <form class="wt-page-content" method="post"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($fact->getParent()->getTree()->getName()) ?>"> - <input type="hidden" name="xref" value="<?= e($fact->getParent()->getXref()) ?>"> + <input type="hidden" name="ged" value="<?= e($fact->record()->getTree()->getName()) ?>"> + <input type="hidden" name="xref" value="<?= e($fact->record()->getXref()) ?>"> <input type="hidden" name="fact_id" value="<?= e($fact->getFactId()) ?>"> @@ -30,7 +30,7 @@ <?= FontAwesome::decorativeIcon('save') ?> <?= /* I18N: A button label. */ I18N::translate('save') ?> </button> - <a class="btn btn-secondary" href="<?= e($fact->getParent()->url()) ?>"> + <a class="btn btn-secondary" href="<?= e($fact->record()->url()) ?>"> <?= FontAwesome::decorativeIcon('cancel') ?> <?= /* I18N: A button label. */ I18N::translate('cancel') ?> </a> diff --git a/resources/views/edit/reorder-names.phtml b/resources/views/edit/reorder-names.phtml index ff41627c18..bdb3f35454 100644 --- a/resources/views/edit/reorder-names.phtml +++ b/resources/views/edit/reorder-names.phtml @@ -17,7 +17,7 @@ <?= $fact->getValue() ?> </h3> <div class="card-body"> - <?= GedcomTag::getLabelValue('TYPE', GedcomCodeName::getValue($fact->getAttribute('TYPE'), $fact->getParent())) ?> + <?= GedcomTag::getLabelValue('TYPE', GedcomCodeName::getValue($fact->getAttribute('TYPE'), $fact->record())) ?> </div> </div> <?php endforeach ?> diff --git a/resources/views/modules/todays_events/list.phtml b/resources/views/modules/todays_events/list.phtml index f5b89e5d39..bea8b88bec 100644 --- a/resources/views/modules/todays_events/list.phtml +++ b/resources/views/modules/todays_events/list.phtml @@ -2,7 +2,7 @@ <?php use Fisharebest\Webtrees\Individual; ?> <?php foreach ($facts as $fact) : ?> - <?php $record = $fact->getParent(); ?> + <?php $record = $fact->record(); ?> <a href="<?= e($record->url()) ?>" class="list_item name2"> <?= $record->getFullName() ?> </a> diff --git a/resources/views/modules/todays_events/table.phtml b/resources/views/modules/todays_events/table.phtml index 1447460601..05a7f789a6 100644 --- a/resources/views/modules/todays_events/table.phtml +++ b/resources/views/modules/todays_events/table.phtml @@ -22,7 +22,7 @@ </thead> <tbody> <?php foreach ($facts as $fact) : ?> - <?php $record = $fact->getParent(); ?> + <?php $record = $fact->record(); ?> <tr> <td data-sort="<?= e($record->getSortName()) ?>"> <a href="<?= e($record->url()) ?>"> diff --git a/resources/views/modules/todo/research-tasks.phtml b/resources/views/modules/todo/research-tasks.phtml index 8d433cd801..0bbc998c3e 100644 --- a/resources/views/modules/todo/research-tasks.phtml +++ b/resources/views/modules/todo/research-tasks.phtml @@ -24,9 +24,9 @@ <td data-sort="<?= $task->getDate()->julianDay() ?>" class="d-none d-md-table-cell wt-side-block-optional"> <?= $task->getDate()->display() ?> </td> - <td data-sort="<?= e($task->getParent()->getSortName()) ?>"> - <a href="<?= e($task->getParent()->url()) ?>"> - <?= $task->getParent()->getFullName() ?> + <td data-sort="<?= e($task->record()->getSortName()) ?>"> + <a href="<?= e($task->record()->url()) ?>"> + <?= $task->record()->getFullName() ?> </a> </td> <td class="d-none d-md-table-cell wt-side-block-optional"> diff --git a/resources/views/modules/upcoming_events/list.phtml b/resources/views/modules/upcoming_events/list.phtml index f5b89e5d39..bea8b88bec 100644 --- a/resources/views/modules/upcoming_events/list.phtml +++ b/resources/views/modules/upcoming_events/list.phtml @@ -2,7 +2,7 @@ <?php use Fisharebest\Webtrees\Individual; ?> <?php foreach ($facts as $fact) : ?> - <?php $record = $fact->getParent(); ?> + <?php $record = $fact->record(); ?> <a href="<?= e($record->url()) ?>" class="list_item name2"> <?= $record->getFullName() ?> </a> diff --git a/resources/views/modules/upcoming_events/table.phtml b/resources/views/modules/upcoming_events/table.phtml index 1447460601..05a7f789a6 100644 --- a/resources/views/modules/upcoming_events/table.phtml +++ b/resources/views/modules/upcoming_events/table.phtml @@ -22,7 +22,7 @@ </thead> <tbody> <?php foreach ($facts as $fact) : ?> - <?php $record = $fact->getParent(); ?> + <?php $record = $fact->record(); ?> <tr> <td data-sort="<?= e($record->getSortName()) ?>"> <a href="<?= e($record->url()) ?>"> diff --git a/resources/views/timeline-chart.phtml b/resources/views/timeline-chart.phtml index 4c4e18483a..830a7ce0db 100644 --- a/resources/views/timeline-chart.phtml +++ b/resources/views/timeline-chart.phtml @@ -314,22 +314,22 @@ echo 'right: 3px;">'; } - $col = array_search($event->getParent(), $individuals); + $col = array_search($event->record(), $individuals); if ($col === false) { // Marriage event - use the color of the husband - $col = array_search($event->getParent()->getHusband(), $individuals); + $col = array_search($event->record()->getHusband(), $individuals); } if ($col === false) { // Marriage event - use the color of the wife - $col = array_search($event->getParent()->getWife(), $individuals); + $col = array_search($event->record()->getWife(), $individuals); } $col = $col % 6; echo '</td><td class="person' . $col . '">'; if (count($individuals) > 6) { // We only have six colours, so show naes if more than this number - echo $event->getParent()->getFullName() . ' — '; + echo $event->record()->getFullName() . ' — '; } - $record = $event->getParent(); + $record = $event->record(); echo $event->getLabel(); echo ' — '; if ($record instanceof Individual) { @@ -359,8 +359,8 @@ echo ' — ' . $event->getPlace()->getShortName(); } // Print spouses names for family events - if ($event->getParent() instanceof Family) { - echo ' — <a href="', e($event->getParent()->url()), '">', $event->getParent()->getFullName(), '</a>'; + if ($event->record() instanceof Family) { + echo ' — <a href="', e($event->record()->url()), '">', $event->record()->getFullName(), '</a>'; } echo '</td></tr></table>'; echo '</div>'; |
