mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
Merge pull request #16436 from marcusmoore/fixes/report-template-link
Some checks failed
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.4) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Some checks failed
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.4) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Fixed linking in saved report template dropdown
This commit is contained in:
commit
c5dd942f3d
|
@ -627,7 +627,11 @@
|
|||
>
|
||||
<option></option>
|
||||
@foreach($report_templates as $savedTemplate)
|
||||
<option value="{{ $savedTemplate->id }}" @selected($savedTemplate->is(request()->route()->parameter('reportTemplate')))>
|
||||
<option
|
||||
value="{{ $savedTemplate->id }}"
|
||||
data-route="{{ route('report-templates.show', $savedTemplate->id) }}"
|
||||
@selected($savedTemplate->is(request()->route()->parameter('reportTemplate')))
|
||||
>
|
||||
{{ $savedTemplate->name }}
|
||||
</option>
|
||||
@endforeach
|
||||
|
@ -774,7 +778,7 @@
|
|||
|
||||
$('#saved_report_select')
|
||||
.on('select2:select', function (event) {
|
||||
window.location.href = '/reports/templates/' + event.params.data.id;
|
||||
window.location.href = event.params.data.element.dataset.route;
|
||||
});
|
||||
|
||||
$('#dataConfirmModal').on('show.bs.modal', function (event) {
|
||||
|
|
Loading…
Reference in a new issue