From b3d673b0aa0e481604ff468844e9f91323aeb471 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 16 Feb 2018 21:38:56 -0800
Subject: [PATCH] Fixed #5037 - use line breaks in notes in table view

---
 app/Presenters/AssetPresenter.php                  | 1 +
 app/Presenters/LicensePresenter.php                | 1 +
 resources/views/asset_maintenances/index.blade.php | 2 +-
 resources/views/partials/bootstrap-table.blade.php | 8 ++++++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index b011ee15f1..f87819a0cb 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -180,6 +180,7 @@ class AssetPresenter extends Presenter
                 "sortable" => true,
                 "visible" => false,
                 "title" => trans('general.notes'),
+
             ], [
                 "field" => "created_at",
                 "searchable" => false,
diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php
index 0cdff34f92..249170379d 100644
--- a/app/Presenters/LicensePresenter.php
+++ b/app/Presenters/LicensePresenter.php
@@ -117,6 +117,7 @@ class LicensePresenter extends Presenter
                 "sortable" => true,
                 "visible" => false,
                 "title" => trans('general.notes'),
+                "formatter" => "notesFormatter"
             ]
         ];
 
diff --git a/resources/views/asset_maintenances/index.blade.php b/resources/views/asset_maintenances/index.blade.php
index 2b926cef58..d80e267229 100644
--- a/resources/views/asset_maintenances/index.blade.php
+++ b/resources/views/asset_maintenances/index.blade.php
@@ -51,7 +51,7 @@
               <th class="text-right" data-searchable="true" data-visible="true"  data-sortable="true" data-field="asset_maintenance_time" data-footer-formatter="sumFormatter">{{ trans('admin/asset_maintenances/form.asset_maintenance_time') }}</th>
               <th data-searchable="true" data-sortable="true" data-field="cost" class="text-right" data-footer-formatter="sumFormatter">{{ trans('admin/asset_maintenances/form.cost') }}</th>
               <th data-searchable="true" data-visible="true"  data-sortable="true" data-field="user_id" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
-              <th data-searchable="true" data-visible="true" data-sortable="true" data-field="notes">{{ trans('admin/asset_maintenances/form.notes') }}</th>
+              <th data-searchable="true" data-visible="true" data-sortable="true" data-field="notes" data-formatter="notesFormatter">{{ trans('admin/asset_maintenances/form.notes') }}</th>
               @can('update', \App\Models\Asset::class)
                 <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" data-formatter="maintenanceActions">{{ trans('table.actions') }}</th>
               @endcan
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index a446bded38..aea5f9490f 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -252,6 +252,14 @@
     }
 
 
+    // Convert line breaks to <br>
+    function notesFormatter(value) {
+        if (value) {
+            return value.replace(/(?:\r\n|\r|\n)/g, '<br />');;
+        }
+    }
+
+
     // We need a special formatter for license seats, since they don't work exactly the same
     // Checkouts need the license ID, checkins need the specific seat ID