diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-09-25 13:35:53 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-09-25 13:35:53 +0100 |
| commit | 3c43c4aeff48828e037fd7a73f999edf8c751838 (patch) | |
| tree | f8d876d11f67e02c2b9332d3b4805375089e94db /resources/views/modals | |
| parent | e37157fc58d1c7e38208e290826c54091312546e (diff) | |
| download | webtrees-3c43c4aeff48828e037fd7a73f999edf8c751838.tar.gz webtrees-3c43c4aeff48828e037fd7a73f999edf8c751838.tar.bz2 webtrees-3c43c4aeff48828e037fd7a73f999edf8c751838.zip | |
Working on media handling
Diffstat (limited to 'resources/views/modals')
| -rw-r--r-- | resources/views/modals/media-file-fields.phtml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/resources/views/modals/media-file-fields.phtml b/resources/views/modals/media-file-fields.phtml index 50e691bfb2..182b2cb1a2 100644 --- a/resources/views/modals/media-file-fields.phtml +++ b/resources/views/modals/media-file-fields.phtml @@ -46,7 +46,7 @@ <label class="form-check-label"> <input class="form-check-input" type="radio" name="auto" value="0" checked> <!-- @TODO typeaheadjs.css doesn't work with input-group --> - <input class="form-control" id="folder" name="folder" placeholder="<?= I18N::translate('Folder') ?>" type="text" value="<?= e($media_file ? $media_file->dirname() : '') ?>" data-autocomplete-url="<?= e(route('autocomplete-folder', ['query' => 'QUERY'])) ?>"> + <input class="form-control" id="folder" name="folder" placeholder="<?= I18N::translate('Folder') ?>" type="text" value="<?= e(dirname($media_file->filename()) === '.' ? '' : dirname($media_file->filename())) ?>" data-autocomplete-url="<?= e(route('autocomplete-folder', ['query' => 'QUERY'])) ?>"> <div class="input-group"> <div class="input-group-append"> <span class="input-group-text">/</span> @@ -56,7 +56,7 @@ </div> </div> <div class="col-sm-6"> - <input class="form-control" name="new_file" type="text" placeholder="<?= I18N::translate('Same as uploaded file') ?>" value="<?= e($media_file ? $media_file->basename() : '') ?>"> + <input class="form-control" name="new_file" type="text" placeholder="<?= I18N::translate('Same as uploaded file') ?>" value="<?= e(basename($media_file->filename())) ?>"> </div> </div> <p class="small text-muted"> |