From deff312381337dad07b2622e63d41eb772977e36 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 26 Apr 2023 18:16:23 -0700 Subject: [PATCH] Remove auto-link from from manufacturer warranty Signed-off-by: snipe --- app/Presenters/ManufacturerPresenter.php | 4 ++-- resources/views/partials/bootstrap-table.blade.php | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Presenters/ManufacturerPresenter.php b/app/Presenters/ManufacturerPresenter.php index bc1f08c0d..ed1802cf3 100644 --- a/app/Presenters/ManufacturerPresenter.php +++ b/app/Presenters/ManufacturerPresenter.php @@ -56,7 +56,7 @@ class ManufacturerPresenter extends Presenter 'switchable' => true, 'title' => trans('admin/manufacturers/table.support_url'), 'visible' => true, - 'formatter' => 'linkFormatter', + 'formatter' => 'externalLinkFormatter', ], [ @@ -85,7 +85,7 @@ class ManufacturerPresenter extends Presenter 'switchable' => true, 'title' => trans('admin/manufacturers/table.warranty_lookup_url'), 'visible' => false, - 'formatter' => 'linkFormatter', + 'formatter' => 'externalLinkFormatter', ], [ diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 3e6a9ea3b..2639a8a80 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -511,8 +511,12 @@ } function externalLinkFormatter(value) { + if (value) { - return '' + value + ''; + if ((value.indexOf("{") === -1) || (value.indexOf("}") ===-1)) { + return '' + value + ' {{ trans('hardware/general.mfg_warranty_lookup') }}'; + } + return value; } }