DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes #2317

Browse source
This commit is contained in:
snipe 2016-07-28 08:07:14 -07:00
parent f53c5706f6
commit fbd0059bbb
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/ComponentsController.php
View file

@ -503,7 +503,7 @@ class ComponentsController extends Controller
foreach ($component->assets as $component_assignment) { foreach ($component->assets as $component_assignment) {
$rows[] = array( $rows[] = array(
'name' => (string)link_to('/hardware/'.$component_assignment->id.'/view', e($component_assignment->name)), 'name' => (string)link_to('/hardware/'.$component_assignment->id.'/view', e($component_assignment->showAssetName())),
'qty' => e($component_assignment->pivot->assigned_qty), 'qty' => e($component_assignment->pivot->assigned_qty),
'created_at' => ($component_assignment->created_at->format('Y-m-d H:i:s')=='-0001-11-30 00:00:00') ? '' : $component_assignment->created_at->format('Y-m-d H:i:s'), 'created_at' => ($component_assignment->created_at->format('Y-m-d H:i:s')=='-0001-11-30 00:00:00') ? '' : $component_assignment->created_at->format('Y-m-d H:i:s'),
); );

2
app/Models/Asset.php
View file

@ -376,7 +376,7 @@ class Asset extends Depreciable
{ {
if ($this->name == '') { if ($this->name == '') {
return $this->model->name; return $this->model->name.' ('.$this->asset_tag.')';
} else { } else {
return $this->name; return $this->name;
} }