From 249b9b750907dedc7e0c7ea5db5cf3a91f1395af Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 3 Sep 2020 19:40:17 -0700 Subject: [PATCH] Fixed [ch15086] - [object object] in companies date displays --- app/Presenters/CompanyPresenter.php | 2 ++ resources/views/partials/bootstrap-table.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Presenters/CompanyPresenter.php b/app/Presenters/CompanyPresenter.php index 6ecba2e915..9f8e6fb376 100644 --- a/app/Presenters/CompanyPresenter.php +++ b/app/Presenters/CompanyPresenter.php @@ -82,12 +82,14 @@ class CompanyPresenter extends Presenter "sortable" => true, "visible" => false, "title" => trans('general.updated_at'), + "formatter" => 'createdAtFormatter', ],[ "field" => "created_at", "searchable" => false, "sortable" => true, "visible" => false, "title" => trans('general.created_at'), + "formatter" => 'createdAtFormatter', ],[ "field" => "actions", "searchable" => false, diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 0294173ae7..e6143b413c 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -391,8 +391,8 @@ function createdAtFormatter(value) { - if ((value) && (value.date)) { - return value.date; + if ((value) && (value.formatted)) { + return value.formatted; } }