mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-28 23:19:42 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
14db425725
|
@ -46,15 +46,6 @@ class AssetModel extends SnipeModel
|
||||||
protected $injectUniqueIdentifier = true;
|
protected $injectUniqueIdentifier = true;
|
||||||
use ValidatingTrait;
|
use ValidatingTrait;
|
||||||
|
|
||||||
public function setEolAttribute($value)
|
|
||||||
{
|
|
||||||
if ($value == '') {
|
|
||||||
$value = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->attributes['eol'] = $value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The attributes that are mass assignable.
|
* The attributes that are mass assignable.
|
||||||
*
|
*
|
||||||
|
|
|
@ -11,15 +11,6 @@ class AssetModelTest extends TestCase
|
||||||
{
|
{
|
||||||
use InteractsWithSettings;
|
use InteractsWithSettings;
|
||||||
|
|
||||||
public function testAnAssetModelZerosOutBlankEols()
|
|
||||||
{
|
|
||||||
$am = new AssetModel;
|
|
||||||
$am->eol = '';
|
|
||||||
$this->assertTrue($am->eol === 0);
|
|
||||||
$am->eol = '4';
|
|
||||||
$this->assertTrue($am->eol == 4);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testAnAssetModelContainsAssets()
|
public function testAnAssetModelContainsAssets()
|
||||||
{
|
{
|
||||||
$category = Category::factory()->create([
|
$category = Category::factory()->create([
|
||||||
|
|
Loading…
Reference in a new issue