diff --git a/app/config/version.php b/app/config/version.php index 2cf581f921..6a7420544e 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.0.5-pre', - 'hash_version' => 'v2.0.5-pre-183-g99391d0', + 'hash_version' => 'v2.0.5-pre-184-g632fa92', ); \ No newline at end of file diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php index ea94a3ea80..35d1628d48 100755 --- a/app/controllers/admin/ModelsController.php +++ b/app/controllers/admin/ModelsController.php @@ -17,6 +17,7 @@ use View; use Datatable; use Asset; use Company; +use Config; //use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\JsonResponse; @@ -425,6 +426,7 @@ class ModelsController extends AdminController 'id' => $model->id, 'manufacturer' => link_to('/admin/settings/manufacturers/'.$model->manufacturer->id.'/view', $model->manufacturer->name), 'name' => link_to('/hardware/models/'.$model->id.'/view', $model->name), + 'image' => ($model->image!='') ? '' : '', 'modelnumber' => $model->modelno, 'numassets' => $model->assets->count(), 'depreciation' => (($model->depreciation)&&($model->depreciation->id > 0)) ? $model->depreciation->name.' ('.$model->depreciation->months.')' : Lang::get('general.no_depreciation'), diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php index 7a0410106b..b4b296b2d1 100755 --- a/app/views/backend/models/index.blade.php +++ b/app/views/backend/models/index.blade.php @@ -32,15 +32,16 @@ data-cookie-id-table="modelsTable-v{{ Config::get('version.app_version') }}"> - {{Lang::get('general.id')}} - {{Lang::get('general.manufacturer')}} - {{Lang::get('admin/models/table.title')}} - {{Lang::get('admin/models/table.modelnumber')}} - {{Lang::get('admin/models/table.numassets')}} - {{Lang::get('general.depreciation')}} - {{Lang::get('general.category')}} - {{Lang::get('general.eol')}} - {{ Lang::get('table.actions') }} + @lang('general.id') + @lang('admin/hardware/table.image') + @lang('general.manufacturer') + @lang('admin/models/table.title') + @lang('admin/models/table.modelnumber') + @lang('admin/models/table.numassets') + @lang('general.depreciation') + @lang('general.category') + @lang('general.eol') + @lang('table.actions')