diff --git a/app/Presenters/HistoryPresenter.php b/app/Presenters/HistoryPresenter.php index 543d840bc9..3b90dff31a 100644 --- a/app/Presenters/HistoryPresenter.php +++ b/app/Presenters/HistoryPresenter.php @@ -11,9 +11,19 @@ class HistoryPresenter extends Presenter * Json Column Layout for bootstrap table * @return string */ - public static function dataTableLayout() + public static function dataTableLayout($serial = false) { - $layout = [ + $extra = []; + $layout_start = [ + [ + 'id' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, + 'class' => 'hidden-xs', + ], [ 'field' => 'icon', 'searchable' => false, @@ -65,7 +75,22 @@ class HistoryPresenter extends Presenter 'title' => trans('general.item'), 'visible' => false, 'formatter' => 'polymorphicItemFormatter', - ], [ + ], + ]; + + + if ($serial) { + $extra = [ + [ + 'field' => 'item.serial', + 'title' => trans('admin/hardware/table.serial'), + 'visible' => false, + ] + ]; + } + + $layout_end = [ + [ 'field' => 'target', 'searchable' => true, 'sortable' => true, @@ -140,7 +165,8 @@ class HistoryPresenter extends Presenter ], ]; - return json_encode($layout); + $merged = array_merge($layout_start, $extra, $layout_end); + return json_encode($merged); } } \ No newline at end of file diff --git a/resources/views/reports/activity.blade.php b/resources/views/reports/activity.blade.php index c8f789ec76..f671e114a8 100644 --- a/resources/views/reports/activity.blade.php +++ b/resources/views/reports/activity.blade.php @@ -25,6 +25,7 @@
| - {{ trans('general.id') }} - | -- {{ trans('admin/hardware/table.icon') }} - | -- {{ trans('general.date') }} - | -- {{ trans('general.admin') }} - | -- {{ trans('general.action') }} - | -- {{ trans('general.file_name') }} - | -- {{ trans('general.type') }} - | -- {{ trans('admin/hardware/table.serial') }} - | -- {{ trans('general.item') }} - | -- {{ trans('general.to') }} - | -- {{ trans('general.notes') }} - | -- {{ trans('general.changed') }} - | -- {{ trans('admin/settings/general.login_ip') }} - | -- {{ trans('admin/settings/general.login_user_agent') }} - | -- {{ trans('general.action_source') }} - | -
|---|