Skip to content

A free open source IT asset/license management system

Fixed #18500 - skip encoding on API url for table component

snipea8c268760b38
diff --git a/resources/views/blade/table.blade.php b/resources/views/blade/table.blade.php
index c6ecea6496..bd4080f421 100644
--- a/resources/views/blade/table.blade.php
+++ b/resources/views/blade/table.blade.php
@@ -29,7 +29,7 @@
@endif
@if ($api_url)
data-side-pagination="server"
- data-url="{{ $api_url }}"
+ data-url="{!! $api_url !!}"
@endif
data-export-options='{
"fileName": "{{ $export_filename }}",
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index 5e9db988e5..37338c4101 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -366,9 +366,9 @@
<x-slot:content>
<x-table
name="locationHistory"
- api_url="{{ route('api.activity.index', ['target_id' => $location->id, 'target_type' => 'location']) }}"
+ api_url="{{ route('api.activity.index', ['item_id' => $location->id, 'item_type' => 'location']) }}"
:presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"
- export_filename="export-children-locations-{{ str_slug($location->name) }}-{{ date('Y-m-d') }}"
+ export_filename="export-locations-history-{{ str_slug($location->name) }}-{{ date('Y-m-d') }}"
/>
</x-slot:content>
</x-tabs.pane>