diff --git a/app/config/version.php b/app/config/version.php index e5af28b959..d8149f9eca 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ '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', ); \ No newline at end of file diff --git a/app/views/backend/dashboard.blade.php b/app/views/backend/dashboard.blade.php index cd23da078d..dc415875cd 100755 --- a/app/views/backend/dashboard.blade.php +++ b/app/views/backend/dashboard.blade.php @@ -48,15 +48,13 @@ {{{ $activity->adminlog->fullName() }}} - @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