@@ -8,13 +8,13 @@ |
||
| 8 | 8 | |
| 9 | 9 | <?php if ($source->isPendingDeletion()): ?> |
| 10 | 10 | <?php if (Auth::isModerator($source->getTree())): ?> |
| 11 | - <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This source has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
| 11 | + <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
| 12 | 12 | <?php elseif (Auth::isEditor($source->getTree())): ?> |
| 13 | 13 | <?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This source has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
| 14 | 14 | <?php endif ?> |
| 15 | 15 | <?php elseif ($source->isPendingAddition()): ?> |
| 16 | 16 | <?php if (Auth::isModerator($source->getTree())): ?> |
| 17 | - <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This source has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $source->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>' ) . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
| 17 | + <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $source->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
| 18 | 18 | <?php elseif (Auth::isEditor($source->getTree())): ?> |
| 19 | 19 | <?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This source has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
| 20 | 20 | <?php endif ?> |
@@ -68,7 +68,7 @@ |
||
| 68 | 68 | */ |
| 69 | 69 | public function updateRecord(GedcomRecord $record): string { |
| 70 | 70 | $old_gedcom = $record->getGedcom(); |
| 71 | - $tree = $record->getTree(); |
|
| 71 | + $tree = $record->getTree(); |
|
| 72 | 72 | |
| 73 | 73 | $SURNAME_TRADITION = $tree->getPreference('SURNAME_TRADITION'); |
| 74 | 74 | |
@@ -173,7 +173,7 @@ |
||
| 173 | 173 | /** @var Tree $tree */ |
| 174 | 174 | $tree = $request->attributes->get('tree'); |
| 175 | 175 | |
| 176 | - $q = $request->get('q'); |
|
| 176 | + $q = $request->get('q'); |
|
| 177 | 177 | $instance = $request->get('instance'); |
| 178 | 178 | $treeview = new TreeView($instance); |
| 179 | 179 | |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | echo view('cards/add-source-citation', [ |
| 92 | 92 | 'level' => 2, |
| 93 | 93 | 'full_citations' => $tree->getPreference('FULL_SOURCES'), |
| 94 | - ]); } |
|
| 94 | + ]); } |
|
| 95 | 95 | if ($level1type !== 'OBJE') { |
| 96 | 96 | if ($tree->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($tree)) { |
| 97 | 97 | echo view('cards/add-media-object', [ |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | ////////////////////////////////////////////////////////////////////////////// |
| 400 | 400 | // Add a child to an existing individual (creating a one-parent family) |
| 401 | 401 | ////////////////////////////////////////////////////////////////////////////// |
| 402 | - $tree = $controller->tree(); |
|
| 402 | + $tree = $controller->tree(); |
|
| 403 | 403 | $xref = Filter::post('xref', WT_REGEX_XREF); |
| 404 | 404 | $PEDI = Filter::post('PEDI'); |
| 405 | 405 | $glevels = Filter::postArray('glevels', '[0-9]'); |