diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php index 31c585d51..32331854e 100755 --- a/resources/views/hardware/index.blade.php +++ b/resources/views/hardware/index.blade.php @@ -77,11 +77,11 @@ {{ trans('general.company') }} {{ trans('admin/hardware/table.image') }} {{ trans('admin/hardware/form.name') }} - {{ trans('admin/hardware/table.asset_tag') }} - {{ trans('admin/hardware/table.serial') }} + {{ trans('admin/hardware/table.asset_tag') }} + {{ trans('admin/hardware/table.serial') }} {{ trans('admin/hardware/form.model') }} {{ trans('admin/models/table.modelnumber') }} - {{ trans('admin/hardware/table.status') }} + {{ trans('admin/hardware/table.status') }} {{ trans('admin/hardware/form.checkedout_to') }} {{ trans('admin/hardware/table.location') }} {{ trans('general.category') }} diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 27c3675bd..19b0aa47a 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -99,6 +99,18 @@ $('.snipe-table').bootstrapTable({ } } + function assetFormatter(value, row) { + if (value) { + return ' ' + value + ''; + } + } + + function statusFormatter(value, row) { + if (value) { + return ' ' + value.name + ''; + } + } + function companyFormatter(value, row) { if ((value) && (value[0].name)) { return ' ' + value[0].name + '';