diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index c85564fc3c57..e46f168bdaa2 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -33,6 +33,16 @@ public static function parseEscapedMarkedown($str = null)
}
}
+ public static function parseEscapedMarkedownInline($str = null)
+ {
+ $Parsedown = new \Parsedown();
+ $Parsedown->setSafeMode(true);
+
+ if ($str) {
+ return $Parsedown->line($str);
+ }
+ }
+
/**
* The importer has formatted number strings since v3,
* so the value might be a string, or an integer.
diff --git a/app/Http/Transformers/AccessoriesTransformer.php b/app/Http/Transformers/AccessoriesTransformer.php
index 709b337c937b..7b79973a9ad4 100644
--- a/app/Http/Transformers/AccessoriesTransformer.php
+++ b/app/Http/Transformers/AccessoriesTransformer.php
@@ -32,7 +32,7 @@ public function transformAccessory(Accessory $accessory)
'model_number' => ($accessory->model_number) ? e($accessory->model_number) : null,
'category' => ($accessory->category) ? ['id' => $accessory->category->id, 'name'=> e($accessory->category->name)] : null,
'location' => ($accessory->location) ? ['id' => $accessory->location->id, 'name'=> e($accessory->location->name)] : null,
- 'notes' => ($accessory->notes) ? Helper::parseEscapedMarkedown($accessory->notes) : null,
+ 'notes' => ($accessory->notes) ? Helper::parseEscapedMarkedownInline($accessory->notes) : null,
'qty' => ($accessory->qty) ? (int) $accessory->qty : null,
'purchase_date' => ($accessory->purchase_date) ? Helper::getFormattedDateObject($accessory->purchase_date, 'date') : null,
'purchase_cost' => Helper::formatCurrencyOutput($accessory->purchase_cost),
diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php
index ab756a4dd30a..7b7a7fc011fe 100644
--- a/app/Http/Transformers/ActionlogsTransformer.php
+++ b/app/Http/Transformers/ActionlogsTransformer.php
@@ -110,7 +110,7 @@ public function transformActionlog (Actionlog $actionlog, $settings = null)
'type' => e($actionlog->targetType()),
] : null,
- 'note' => ($actionlog->note) ? Helper::parseEscapedMarkedown($actionlog->note): null,
+ 'note' => ($actionlog->note) ? Helper::parseEscapedMarkedownInline($actionlog->note): null,
'signature_file' => ($actionlog->accept_signature) ? route('log.signature.view', ['filename' => $actionlog->accept_signature ]) : null,
'log_meta' => ((isset($clean_meta)) && (is_array($clean_meta))) ? $clean_meta: null,
'action_date' => ($actionlog->action_date) ? Helper::getFormattedDateObject($actionlog->action_date, 'datetime'): Helper::getFormattedDateObject($actionlog->created_at, 'datetime'),
diff --git a/app/Http/Transformers/AssetMaintenancesTransformer.php b/app/Http/Transformers/AssetMaintenancesTransformer.php
index 433c06a49dbe..fa92640823c6 100644
--- a/app/Http/Transformers/AssetMaintenancesTransformer.php
+++ b/app/Http/Transformers/AssetMaintenancesTransformer.php
@@ -49,7 +49,7 @@ public function transformAssetMaintenance(AssetMaintenance $assetmaintenance)
'id' => (int) $assetmaintenance->asset->defaultLoc->id,
'name'=> e($assetmaintenance->asset->defaultLoc->name),
] : null,
- 'notes' => ($assetmaintenance->notes) ? Helper::parseEscapedMarkedown($assetmaintenance->notes) : null,
+ 'notes' => ($assetmaintenance->notes) ? Helper::parseEscapedMarkedownInline($assetmaintenance->notes) : null,
'supplier' => ($assetmaintenance->supplier) ? ['id' => $assetmaintenance->supplier->id, 'name'=> e($assetmaintenance->supplier->name)] : null,
'cost' => Helper::formatCurrencyOutput($assetmaintenance->cost),
'asset_maintenance_type' => e($assetmaintenance->asset_maintenance_type),
diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php
index a2da6c8b42d1..f3a658c872b7 100644
--- a/app/Http/Transformers/AssetModelsTransformer.php
+++ b/app/Http/Transformers/AssetModelsTransformer.php
@@ -63,7 +63,7 @@ public function transformAssetModel(AssetModel $assetmodel)
'default_fieldset_values' => $default_field_values,
'eol' => ($assetmodel->eol > 0) ? $assetmodel->eol.' months' : 'None',
'requestable' => ($assetmodel->requestable == '1') ? true : false,
- 'notes' => Helper::parseEscapedMarkedown($assetmodel->notes),
+ 'notes' => 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/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php
index 0ad93b43ef6a..1633ec6167c5 100644
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -58,7 +58,7 @@ public function transformAsset(Asset $asset)
'id' => (int) $asset->supplier->id,
'name'=> e($asset->supplier->name),
] : null,
- 'notes' => ($asset->notes) ? Helper::parseEscapedMarkedown($asset->notes) : null,
+ 'notes' => ($asset->notes) ? Helper::parseEscapedMarkedownInline($asset->notes) : null,
'order_number' => ($asset->order_number) ? e($asset->order_number) : null,
'company' => ($asset->company) ? [
'id' => (int) $asset->company->id,
diff --git a/app/Http/Transformers/ComponentsTransformer.php b/app/Http/Transformers/ComponentsTransformer.php
index e758a95e3c00..d18870bdc350 100644
--- a/app/Http/Transformers/ComponentsTransformer.php
+++ b/app/Http/Transformers/ComponentsTransformer.php
@@ -46,7 +46,7 @@ public function transformComponent(Component $component)
'id' => (int) $component->company->id,
'name' => e($component->company->name),
] : null,
- 'notes' => ($component->notes) ? Helper::parseEscapedMarkedown($component->notes) : null,
+ 'notes' => ($component->notes) ? Helper::parseEscapedMarkedownInline($component->notes) : null,
'created_at' => Helper::getFormattedDateObject($component->created_at, 'datetime'),
'updated_at' => Helper::getFormattedDateObject($component->updated_at, 'datetime'),
'user_can_checkout' => ($component->numRemaining() > 0) ? 1 : 0,
diff --git a/app/Http/Transformers/ConsumablesTransformer.php b/app/Http/Transformers/ConsumablesTransformer.php
index 27e70fcf0bb1..f23ebc03828a 100644
--- a/app/Http/Transformers/ConsumablesTransformer.php
+++ b/app/Http/Transformers/ConsumablesTransformer.php
@@ -39,7 +39,7 @@ public function transformConsumable(Consumable $consumable)
'purchase_cost' => Helper::formatCurrencyOutput($consumable->purchase_cost),
'purchase_date' => Helper::getFormattedDateObject($consumable->purchase_date, 'date'),
'qty' => (int) $consumable->qty,
- 'notes' => ($consumable->notes) ? Helper::parseEscapedMarkedown($consumable->notes) : null,
+ 'notes' => ($consumable->notes) ? Helper::parseEscapedMarkedownInline($consumable->notes) : null,
'created_at' => Helper::getFormattedDateObject($consumable->created_at, 'datetime'),
'updated_at' => Helper::getFormattedDateObject($consumable->updated_at, 'datetime'),
];
diff --git a/app/Http/Transformers/LicensesTransformer.php b/app/Http/Transformers/LicensesTransformer.php
index b5b0d841f5fd..f68ad738d8f8 100644
--- a/app/Http/Transformers/LicensesTransformer.php
+++ b/app/Http/Transformers/LicensesTransformer.php
@@ -34,7 +34,7 @@ public function transformLicense(License $license)
'depreciation' => ($license->depreciation) ? ['id' => (int) $license->depreciation->id,'name'=> e($license->depreciation->name)] : null,
'purchase_cost' => Helper::formatCurrencyOutput($license->purchase_cost),
'purchase_cost_numeric' => $license->purchase_cost,
- 'notes' => Helper::parseEscapedMarkedown($license->notes),
+ 'notes' => Helper::parseEscapedMarkedownInline($license->notes),
'expiration_date' => Helper::getFormattedDateObject($license->expiration_date, 'date'),
'seats' => (int) $license->seats,
'free_seats_count' => (int) $license->free_seats_count,
diff --git a/app/Http/Transformers/SuppliersTransformer.php b/app/Http/Transformers/SuppliersTransformer.php
index e81198763d2e..1fdc93c193b8 100644
--- a/app/Http/Transformers/SuppliersTransformer.php
+++ b/app/Http/Transformers/SuppliersTransformer.php
@@ -43,7 +43,7 @@ public function transformSupplier(Supplier $supplier = null)
'licenses_count' => (int) $supplier->licenses_count,
'consumables_count' => (int) $supplier->consumables_count,
'components_count' => (int) $supplier->components_count,
- 'notes' => ($supplier->notes) ? Helper::parseEscapedMarkedown($supplier->notes) : null,
+ 'notes' => ($supplier->notes) ? Helper::parseEscapedMarkedownInline($supplier->notes) : null,
'created_at' => Helper::getFormattedDateObject($supplier->created_at, 'datetime'),
'updated_at' => Helper::getFormattedDateObject($supplier->updated_at, 'datetime'),
diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php
index 5a45a00124d7..76c02880737d 100644
--- a/app/Http/Transformers/UsersTransformer.php
+++ b/app/Http/Transformers/UsersTransformer.php
@@ -53,7 +53,7 @@ public function transformUser(User $user)
'id' => (int) $user->userloc->id,
'name'=> e($user->userloc->name),
] : null,
- 'notes'=> Helper::parseEscapedMarkedown($user->notes),
+ 'notes'=> Helper::parseEscapedMarkedownInline($user->notes),
'permissions' => $user->decodePermissions(),
'activated' => ($user->activated == '1') ? true : false,
'autoassign_licenses' => ($user->autoassign_licenses == '1') ? true : false,
diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.php
index 8e3d109045b2..8da192ebb28d 100644
--- a/app/Presenters/AssetModelPresenter.php
+++ b/app/Presenters/AssetModelPresenter.php
@@ -123,6 +123,7 @@ public static function dataTableLayout()
'switchable' => true,
'title' => trans('general.notes'),
'visible' => false,
+ 'formatter' => 'notesFormatter',
],
[
'field' => 'created_at',
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index b3798697be48..86b4ee77303e 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -287,7 +287,7 @@ class="table table-striped snipe-table"
- {!! nl2br(e($accessory->notes)) !!}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($accessory->notes)) !!}
diff --git a/resources/views/asset_maintenances/view.blade.php b/resources/views/asset_maintenances/view.blade.php
index cea5eb2c04a1..58abdbc7f56b 100644
--- a/resources/views/asset_maintenances/view.blade.php
+++ b/resources/views/asset_maintenances/view.blade.php
@@ -93,7 +93,7 @@
{{ trans('admin/asset_maintenances/form.notes') }}:
- {{ $assetMaintenance->notes }}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($assetMaintenance->notes)) !!}
diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php
index 6bb3dc26be38..fa9b5ab485db 100644
--- a/resources/views/consumables/view.blade.php
+++ b/resources/views/consumables/view.blade.php
@@ -155,7 +155,7 @@ class="table table-striped snipe-table"
@if ($file->note)
- {{ $file->note }}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($file->note)) !!}
@endif
|
@@ -275,7 +275,7 @@ class="table table-striped snipe-table"
- {!! nl2br(e($consumable->notes)) !!}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($consumable->notes)) !!}
@endif
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index d183df09b393..f99b3f44a5a9 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -730,7 +730,7 @@
- {!! nl2br(e($asset->notes)) !!}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($asset->notes)) !!}
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index e48ab859bd33..8dcf10caf24a 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -357,7 +357,7 @@
- {!! nl2br(e($license->notes)) !!}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($license->notes)) !!}
@endif
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index 9024bd92752e..4edfda1885ad 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -338,7 +338,7 @@ class="table table-striped snipe-table"
@endif
@if ($supplier->notes!='')
- {{ $supplier->notes }}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($supplier->notes)) !!}
@endif
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 47d6dea328b3..83c624f36ba5 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -633,7 +633,7 @@
{{ trans('admin/users/table.notes') }}
- {{ $user->notes }}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($user->notes)) !!}
|