Merge remote-tracking branch 'origin/develop'

snipe · Aug 17, 2016 · 1601494 · 1601494
2 parents c5d7a1f + 44821b9
commit 1601494
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
@@ -98,7 +98,11 @@ public function checkOutToUser($user, $admin, $checkout_at = null, $expected_che
         $this->last_checkout = $checkout_at;
 
         $this->assigneduser()->associate($user);
-        $this->name = $name;
+
+        if($name != null)
+        {
+            $this->name = $name;
+        }
 
         $settings = Setting::getSettings();