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

Hopefully fixes tons of PEBKAC where users have the wrong app.url

Browse Source
This commit is contained in:
snipe
2016-12-14 08:20:05 -08:00
parent 8e5977ad84
commit 863e200430
39 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AssetModelsController.php
+1 -1
View File
@@ -461,7 +461,7 @@ class AssetModelsController extends Controller
'id' => $model->id,
'manufacturer' => (string)link_to('/admin/settings/manufacturers/'.$model->manufacturer->id.'/view', $model->manufacturer->name),
'name' => (string)link_to('/hardware/models/'.$model->id.'/view', $model->name),
'image' => ($model->image!='') ? '<img src="'.config('app.url').'/uploads/models/'.$model->image.'" height=50 width=50>' : '',
'image' => ($model->image!='') ? '<img src="'.\URL::to('/').'/uploads/models/'.$model->image.'" height=50 width=50>' : '',
'modelnumber' => $model->model_number,
'numassets' => $model->assets->count(),
'depreciation' => (($model->depreciation) && ($model->depreciation->id > 0)) ? $model->depreciation->name.' ('.$model->depreciation->months.')' : trans('general.no_depreciation'),