DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2016-08-16 18:23:36 -07:00
parent c5d7a1fdd6 44821b9667
commit 16014945b6
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Models/Asset.php
View file

@ -98,7 +98,11 @@ class Asset extends Depreciable
$this->last_checkout = $checkout_at; $this->last_checkout = $checkout_at;
$this->assigneduser()->associate($user); $this->assigneduser()->associate($user);
$this->name = $name;
if($name != null)
{
$this->name = $name;
}
$settings = Setting::getSettings(); $settings = Setting::getSettings();