DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop

Browse source
This commit is contained in:
snipe 2020-09-03 19:41:09 -07:00
parent 25cb489b76 249b9b7509
commit 96abe54aad
No known key found for this signature in database
GPG key ID: 10BFFDA3ED34B5AC
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Presenters/CompanyPresenter.php
View file

@ -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,

4
resources/views/partials/bootstrap-table.blade.php
View file

@ -391,8 +391,8 @@
function createdAtFormatter(value) {
if ((value) && (value.date)) {
return value.date;
if ((value) && (value.formatted)) {
return value.formatted;
}
}