From 5d1f294f0eabe21e26b5cc796e2512c08be6e1a6 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 13 Jul 2023 12:03:01 +0100 Subject: [PATCH] Added parseEscapedMarkedownInline to accessories API Signed-off-by: snipe --- app/Http/Transformers/AssetModelsTransformer.php | 2 +- resources/views/accessories/view.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php index f3a658c872..a45f8f9579 100644 --- a/app/Http/Transformers/AssetModelsTransformer.php +++ b/app/Http/Transformers/AssetModelsTransformer.php @@ -63,7 +63,7 @@ class AssetModelsTransformer 'default_fieldset_values' => $default_field_values, 'eol' => ($assetmodel->eol > 0) ? $assetmodel->eol.' months' : 'None', 'requestable' => ($assetmodel->requestable == '1') ? true : false, - 'notes' => Helper::parseEscapedMarkedownInline($assetmodel->notes), + 'notes' => nl2br(Helper::parseEscapedMarkedownInline($assetmodel->notes)), 'created_at' => Helper::getFormattedDateObject($assetmodel->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($assetmodel->updated_at, 'datetime'), 'deleted_at' => Helper::getFormattedDateObject($assetmodel->deleted_at, 'datetime'), diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index b3798697be..86b4ee7730 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -287,7 +287,7 @@
- {!! nl2br(e($accessory->notes)) !!} + {!! nl2br(Helper::parseEscapedMarkedownInline($accessory->notes)) !!}