lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #12933 from snipe/features/unlink_dynamic_urls_if_variables_used

Browse source 
Remove auto-link from from manufacturer warranty
This commit is contained in:
snipe 2023-04-26 18:40:33 -07:00 • committed by GitHub
commit dcb7eadfc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Presenters/ManufacturerPresenter.php
View file

@ -56,7 +56,7 @@ class ManufacturerPresenter extends Presenter
'switchable' => true, 'switchable' => true,
'title' => trans('admin/manufacturers/table.support_url'), 'title' => trans('admin/manufacturers/table.support_url'),
'visible' => true, 'visible' => true,
'formatter' => 'linkFormatter', 'formatter' => 'externalLinkFormatter',
], ],
[ [
@ -85,7 +85,7 @@ class ManufacturerPresenter extends Presenter
'switchable' => true, 'switchable' => true,
'title' => trans('admin/manufacturers/table.warranty_lookup_url'), 'title' => trans('admin/manufacturers/table.warranty_lookup_url'),
'visible' => false, 'visible' => false,
'formatter' => 'linkFormatter', 'formatter' => 'externalLinkFormatter',
], ],
[ [

2
resources/views/hardware/view.blade.php
View file

@ -597,7 +597,7 @@
@if (($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!='')) @if (($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!=''))
<a href="{{ $asset->present()->dynamicWarrantyUrl() }}" target="_blank"> <a href="{{ $asset->present()->dynamicWarrantyUrl() }}" target="_blank">
<i class="fa fa-external-link"><span class="sr-only">{{ trans('hardware/general.mfg_warranty_lookup') }}</span></i> <i class="fa fa-external-link"><span class="sr-only">{{ trans('admin/hardware/general.mfg_warranty_lookup', ['manufacturer' => $asset->model->manufacturer->name]) }}</span></i>
</a> </a>
@endif @endif
</div> </div>

6
resources/views/partials/bootstrap-table.blade.php
View file

@ -511,8 +511,12 @@
} }
function externalLinkFormatter(value) { function externalLinkFormatter(value) {
if (value) { if (value) {
return '<a href="' + value + '" target="_blank">' + value + '</a>'; if ((value.indexOf("{") === -1) || (value.indexOf("}") ===-1)) {
return '<a href="' + value + '" target="_blank">' + value + ' <i class="fa fa-external-link"></i></a>';
}
return value;
} }
} }