Fixes #757 - use showAssetName method

This commit is contained in:
snipe
2015-04-29 16:22:25 -07:00
parent 179ef7f060
commit 3b491d4a6b
2 changed files with 9 additions and 11 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
<?php
return array (
'app_version' => 'v1.2.6.1-227',
'hash_version' => 'v1.2.6.1-227-gbce0654',
'app_version' => 'v1.2.6.1-228',
'hash_version' => 'v1.2.6.1-228-ga0fce2e',
);
+7 -9
View File
@@ -48,15 +48,13 @@
<td>{{{ $activity->adminlog->fullName() }}}</td>
<td>
@if ($activity->asset_type=="hardware")
{{{ $activity->assetlog->name }}}
@elseif ($activity->asset_type=="software")
@if ($activity->licenselog)
{{{ $activity->licenselog->name }}}
@endif
@elseif ($activity->asset_type=="accessory")
{{{ $activity->accessorylog->name }}}
@endif
@if ($activity->asset_type=="hardware")
{{ $activity->assetlog->showAssetName() }}
@elseif ($activity->asset_type=="software")
{{ $activity->licenselog->name }}
@elseif ($activity->asset_type=="accessory")
{{ $activity->accessorylog->name }}
@endif
</td>
<td>