Skip to content

Commit 1601494

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents c5d7a1f + 44821b9 commit 1601494

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

app/Models/Asset.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,11 @@ public function checkOutToUser($user, $admin, $checkout_at = null, $expected_che
9898
$this->last_checkout = $checkout_at;
9999

100100
$this->assigneduser()->associate($user);
101-
$this->name = $name;
101+
102+
if($name != null)
103+
{
104+
$this->name = $name;
105+
}
102106

103107
$settings = Setting::getSettings();
104108

0 commit comments

Comments
 (0)