ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added image to model listing view for #1370

Browse Source
This commit is contained in:
snipe
2015-11-24 23:24:20 -08:00
parent 0f33bad1b6
commit 64eecc8df7
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/version.php
+1 -1
View File
@@ -1,5 +1,5 @@
<?php
return array (
'app_version' => 'v2.0.5-pre',
'hash_version' => 'v2.0.5-pre-183-g99391d0',
'hash_version' => 'v2.0.5-pre-184-g632fa92',
);
app/controllers/admin/ModelsController.php
+2
View File
@@ -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!='') ? '<img src="'.Config::get('app.url').'/uploads/models/'.$model->image.'" height=50 width=50>' : '',
'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'),
app/views/backend/models/index.blade.php
+10 -9
View File
@@ -32,15 +32,16 @@
data-cookie-id-table="modelsTable-v{{ Config::get('version.app_version') }}">
<thead>
<tr>
<th data-sortable="true" data-field="id" data-visible="false">{{Lang::get('general.id')}}</th>
<th data-sortable="false" data-field="manufacturer">{{Lang::get('general.manufacturer')}}</th>
<th data-sortable="true" data-field="name">{{Lang::get('admin/models/table.title')}}</th>
<th data-sortable="true" data-field="modelnumber">{{Lang::get('admin/models/table.modelnumber')}}</th>
<th data-sortable="false" data-field="numassets">{{Lang::get('admin/models/table.numassets')}}</th>
<th data-sortable="false" data-field="depreciation">{{Lang::get('general.depreciation')}}</th>
<th data-sortable="false" data-field="category">{{Lang::get('general.category')}}</th>
<th data-sortable="true" data-field="eol">{{Lang::get('general.eol')}}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ Lang::get('table.actions') }}</th>
<th data-sortable="true" data-field="id" data-visible="false">@lang('general.id')</th>
<th data-sortable="true" data-field="image" data-visible="false">@lang('admin/hardware/table.image')</th>
<th data-sortable="false" data-field="manufacturer">@lang('general.manufacturer')</th>
<th data-sortable="true" data-field="name">@lang('admin/models/table.title')</th>
<th data-sortable="true" data-field="modelnumber">@lang('admin/models/table.modelnumber')</th>
<th data-sortable="false" data-field="numassets">@lang('admin/models/table.numassets')</th>
<th data-sortable="false" data-field="depreciation">@lang('general.depreciation')</th>
<th data-sortable="false" data-field="category">@lang('general.category')</th>
<th data-sortable="true" data-field="eol">@lang('general.eol')</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">@lang('table.actions')</th>
</tr>
</thead>
</table>