diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2022-05-01 19:17:00 +0100 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2022-05-01 19:17:00 +0100 |
| commit | acb90a3897a0c2932393544961e7311805adb49a (patch) | |
| tree | 99f1953ff051d580127dedfc8d5b52d92f772928 /resources/views | |
| parent | c1f982bd447ec3287562442cfee7e98387f793b9 (diff) | |
| download | webtrees-acb90a3897a0c2932393544961e7311805adb49a.tar.gz webtrees-acb90a3897a0c2932393544961e7311805adb49a.tar.bz2 webtrees-acb90a3897a0c2932393544961e7311805adb49a.zip | |
Fix: #4360 - media type lost when editing media file
Diffstat (limited to 'resources/views')
| -rw-r--r-- | resources/views/media-page-details.phtml | 2 | ||||
| -rw-r--r-- | resources/views/modals/media-file-fields.phtml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/resources/views/media-page-details.phtml b/resources/views/media-page-details.phtml index b3de24531a..7b73c20d75 100644 --- a/resources/views/media-page-details.phtml +++ b/resources/views/media-page-details.phtml @@ -25,7 +25,7 @@ use League\Flysystem\FilesystemOperator; <tr class="<?= $media_file->isPendingAddition() ? 'wt-new' : '' ?><?= $media_file->isPendingDeletion() ? 'wt-old' : '' ?>"> <th scope="row"> <?= I18N::translate('Media file') ?> - <?php if ($record->canEdit()) : ?> + <?php if ($record->canEdit() && !$media_file->isPendingDeletion()) : ?> <div class="pt-2 wt-fact-edit-links"> <a class="btn btn-link" href="#" data-bs-toggle="modal" data-bs-backdrop="static" data-bs-target="#wt-ajax-modal" data-wt-href="<?= route(EditMediaFileModal::class, ['tree' => $record->tree()->name(), 'xref' => $record->xref(), 'fact_id' => $media_file->factId()]) ?>" title="<?= I18N::translate('Edit') ?>"> <?= view('icons/edit') ?> diff --git a/resources/views/modals/media-file-fields.phtml b/resources/views/modals/media-file-fields.phtml index 6ca785492a..61550d89da 100644 --- a/resources/views/modals/media-file-fields.phtml +++ b/resources/views/modals/media-file-fields.phtml @@ -1,5 +1,6 @@ <?php +use Fisharebest\Webtrees\Elements\SourceMediaType; use Fisharebest\Webtrees\Http\RequestHandlers\AutoCompleteFolder; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\MediaFile; @@ -116,7 +117,7 @@ use Fisharebest\Webtrees\Tree; <?= I18N::translate('Media type') ?> </label> <div class="col-sm-10"> - <?= view('components/select', ['name' => 'type', 'selected' => $media_file ? $media_file->type() : '', 'options' => $media_types]) ?> + <?= (new SourceMediaType(''))->edit('type', 'type', $media_file ? $media_file->type() : '', $tree) ?> </div> </div> |