DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 15:44:11 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-02-05 19:13:17 +00:00
parent 383e3829e5 7b4020c5e9
commit c0fbf106ed
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/ReportsController.php
View file

@ -616,7 +616,7 @@ class ReportsController extends Controller
} }
if ($request->filled('url')) { if ($request->filled('url')) {
$header[] = trans('admin/manufacturers/table.url'); $header[] = trans('general.url');
} }

2
app/Presenters/ManufacturerPresenter.php
View file

@ -45,7 +45,7 @@ class ManufacturerPresenter extends Presenter
'searchable' => true, 'searchable' => true,
'sortable' => true, 'sortable' => true,
'switchable' => true, 'switchable' => true,
'title' => trans('admin/manufacturers/table.url'), 'title' => trans('general.url'),
'visible' => true, 'visible' => true,
'formatter' => 'externalLinkFormatter', 'formatter' => 'externalLinkFormatter',
], ],