Fixed assetlog display

app/controllers/admin/AccessoriesController.php

@@ -331,10 +331,7 @@ class AccessoriesController extends AdminController
        
 		$accessory = Accessory::find($accessory_user->accessory_id);
         $logaction = new Actionlog();
-        $logaction->checkedout_to = $accessory->assigned_to;
-
-        // Update the accessory data to null, since it's being checked in
-        $accessory->assigned_to            		= NULL;
+        $logaction->checkedout_to = $accessory_user->assigned_to;
 
         // Was the accessory updated?
         if(DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) {

app/models/Actionlog.php

@@ -26,7 +26,7 @@ class Actionlog extends Eloquent
     
     public function accessorylog()
     {
-        return $this->belongsTo('Accessory','asset_id')->withTrashed();
+        return $this->belongsTo('Accessory','accessory_id')->withTrashed();
     }
 
     public function adminlog()

app/views/backend/dashboard.blade.php

@@ -54,6 +54,8 @@
 			           		@if ($activity->licenselog)
 			           		{{{ $activity->licenselog->name }}}
 			           		@endif
+			           	@elseif ($activity->asset_type=="accessory") 
+			           		{{{ $activity->accessorylog->name }}}
 			           	@endif
 			           	
 			           	</td> 

app/views/backend/users/view.blade.php

@@ -210,7 +210,7 @@
                                             <del>{{{ $log->assetlog->name }}}</del> (deleted)
                                             
                                         @elseif ((isset($log->accessorylog->name)) && ($log->accessorylog->deleted_at==''))
-                                            {{{ $log->accessorylog }}} 
+                                            {{{ $log->accessorylog->name }}} 
                                             
                                         @endif
                                         </td>