Fix: manager cannot manage trees

1 files changed, 40 insertions, 30 deletions

diff --git a/resources/views/admin/trees.phtml b/resources/views/admin/trees.phtml
index 7165bbfe59..4009bf4a02 100644
--- a/resources/views/admin/trees.phtml
+++ b/resources/views/admin/trees.phtml
@@ -1,8 +1,12 @@
-<?php use Fisharebest\Webtrees\Auth; ?>
-<?php use Fisharebest\Webtrees\I18N; ?>
-<?php use Fisharebest\Webtrees\Site; ?>
-<?php use Fisharebest\Webtrees\View; ?>
-<?php use Illuminate\Database\Capsule\Manager as DB; ?>
+<?php use Fisharebest\Webtrees\Auth;
+use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Site;
+use Fisharebest\Webtrees\View;
+use Illuminate\Database\Capsule\Manager as DB; ?>
+<?php ?>
+<?php ?>
+<?php ?>
+<?php ?>
 
 <?php if (!empty($all_trees)): ?>
     <?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), $title]]) ?>
@@ -38,11 +42,11 @@
                                 </div>
                             </div>
                             <?php View::push('javascript'); ?>
-                            <script>
-                $("#import<?= $managed_tree->id() ?>").load("<?= route('import', ['ged' => $managed_tree->name()]) ?>", {});
-                            </script>
-                            <?php View::endpush() ?>
-                        <?php endif ?>
+                                <script>
+                                    $("#import<?= $managed_tree->id() ?>").load("<?= route('import', ['ged' => $managed_tree->name()]) ?>", {});
+                                </script>
+                                <?php View::endpush() ?>
+                            <?php endif ?>
                         <div class="row<?= $importing ? ' d-none' : '' ?>" id="actions<?= $managed_tree->id() ?>">
                             <div class="col-sm-6 col-md-3">
                                 <h3>
@@ -82,24 +86,27 @@
                                         </a>
                                     </li>
                                     <!-- DELETE -->
-                                    <li>
-                                        <span class="fa-li"><?= view('icons/delete') ?></span>
-                                        <a href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($managed_tree->title())) ?>" onclick="if (confirm(this.dataset.confirm)) { document.delete_form<?= $managed_tree->id() ?>.submit(); } return false;">
-                                            <?= I18N::translate('Delete') ?>
-                                            <span class="sr-only">
+                                    <?php if (count($all_trees) > 1 && Auth::isAdmin()) : ?>
+                                        <li>
+                                            <span class="fa-li"><?= view('icons/delete') ?></span>
+                                            <a href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($managed_tree->title())) ?>" onclick="if (confirm(this.dataset.confirm)) { document.delete_form<?= $managed_tree->id() ?>.submit(); } return false;">
+                                                <?= I18N::translate('Delete') ?>
+                                                <span class="sr-only">
                                                 <?= e($managed_tree->title()) ?>
                                             </span>
-                                        </a>
-                                        <form name="delete_form<?= $managed_tree->id() ?>" method="post" action="<?= route('admin-trees-delete', ['ged' => $managed_tree->name()]) ?>">
-                                            <?= csrf_field() ?>
-                                            <!-- A11Y - forms need submit buttons, but they look ugly here -->
-                                            <button class="sr-only" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($managed_tree->title())) ?>" onclick="return confirm(this.dataset.confirm)" type="submit">
-                                                <?= I18N::translate('Delete') ?>
-                                            </button>
-                                        </form>
-                                    </li>
+                                            </a>
+                                            <form name="delete_form<?= $managed_tree->id() ?>" method="post" action="<?= route('admin-trees-delete', ['ged' => $managed_tree->name()]) ?>">
+                                                <?= csrf_field() ?>
+                                                <!-- A11Y - forms need submit buttons, but they look ugly here -->
+                                                <button class="sr-only" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($managed_tree->title())) ?>" onclick="return confirm(this.dataset.confirm)" type="submit">
+                                                    <?= I18N::translate('Delete') ?>
+                                                </button>
+                                            </form>
+                                        </li>
+                                    <?php endif ?>
+
                                     <!-- SET AS DEFAULT -->
-                                    <?php if (count($all_trees) > 1) : ?>
+                                    <?php if (count($all_trees) > 1 && Auth::isAdmin()) : ?>
                                         <li>
                                             <span class="fa-li"><?= view('icons/favorite') ?></span>
                                             <?php if ($managed_tree->name() === Site::getPreference('DEFAULT_GEDCOM')) : ?>
@@ -123,7 +130,8 @@
                             </div>
                             <div class="col-sm-6 col-md-3">
                                 <h3>
-                                    <?= /* I18N: Individuals, sources, dates, places, etc. */ I18N::translate('Genealogy data') ?>
+                                    <?= /* I18N: Individuals, sources, dates, places, etc. */
+                                    I18N::translate('Genealogy data') ?>
                                 </h3>
                                 <ul class="fa-ul">
                                     <!-- FIND DUPLICATES -->
@@ -305,7 +313,7 @@
         <div class="card">
             <div class="card-header" id="card-tree-create-header">
                 <h2 class="mb-0">
-            <?= view('icons/add') ?>
+                    <?= view('icons/add') ?>
                     <a data-toggle="collapse" data-parent="#accordion" href="#card-tree-create-content" aria-controls="card-tree-create-content">
                         <?= I18N::translate('Create a family tree') ?>
                     </a>
@@ -345,7 +353,8 @@
                             <div class="offset-sm-2 col-sm-10">
                                 <button type="submit" class="btn btn-primary">
                                     <?= view('icons/save') ?>
-                                    <?= /* I18N: A button label. */ I18N::translate('create') ?>
+                                    <?= /* I18N: A button label. */
+                                    I18N::translate('create') ?>
                                 </button>
                                 <p class="small text-muted">
                                     <?= I18N::translate('After creating the family tree, you will be able to import data from a GEDCOM file.') ?>
@@ -378,8 +387,9 @@
                     <form method="post" class="form form-horizontal" action="<?= e(route('admin-trees-sync', ['ged' => $tree->name()])) ?>">
                         <?= csrf_field() ?>
                         <button type="submit" class="btn btn-danger">
-                <?= view('icons/save') ?>
-                            <?= /* I18N: A button label. */ I18N::translate('continue') ?>
+                            <?= view('icons/save') ?>
+                            <?= /* I18N: A button label. */
+                            I18N::translate('continue') ?>
                         </button>
                         <p class="small text-muted">
                             <?= I18N::translate('Caution! This may take a long time. Be patient.') ?>