c3lf/c3lf-system-3
7
0
Fork 0
Code Issues 52 Pull requests Projects 2 Releases Wiki Activity Actions

a flock of bugfixes

Browse source
This commit is contained in:
j3d1 2020-01-18 21:55:27 +01:00
parent 8ab469e017
commit b0cb0db558
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Item.php
View file

@ -34,10 +34,10 @@ class Item extends Model
public static function create(array $attributes = [])
{
$uid = static::query()->where('eid',$attributes['eid'])->max('uid') + 1;
$uid = static::query()->withTrashed()->where('eid',$attributes['eid'])->max('uid') + 1;
$attributes['uid'] = $uid;
static::query()->create($attributes);
return Item::find($uid);
$item = static::query()->create($attributes);
return Item::find($item->iid);
}
protected static function extended($columns=Array()){

8
tests/ItemTest.php
View file

@ -153,12 +153,12 @@ class ItemTest extends TestCase
$event = Event::create(['slug'=>'EVENT','name'=>'Event']);
$box = Container::create(['name'=>'BOX']);
$item1 = Item::create(['cid'=>$box->cid, 'eid' => $event->eid, 'wann'=>'', 'wo'=>'','description'=>'1']);
Item::create(['cid'=>$box->cid, 'eid' => $event->eid, 'wann'=>'', 'wo'=>'','description'=>'1']);
$item2 = Item::create(['cid'=>$box->cid, 'eid' => $event->eid, 'wann'=>'', 'wo'=>'','description'=>'2']);
$this->assertEquals(2, count(Item::all()));
$this->delete('/1/EVENT/item/'.$item1->uid);
$this->delete('/1/EVENT/item/'.$item2->uid);
$this->assertResponseOk();
$this->assertEquals(1, count(Item::all()));
@ -168,10 +168,6 @@ class ItemTest extends TestCase
$this->assertEquals(3, $item3['uid']);
$this->assertEquals(2, count(Item::all()));
$this->delete('/1/EVENT/item/'.$item2->uid);
$this->assertResponseOk();
$this->assertEquals(1, count(Item::all()));
}
}