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

bugfix in Container.php: also return empty containers again

Browse source
This commit is contained in:
j3d1 2020-01-17 20:03:24 +01:00
parent 1ee019a37f
commit dbc4a84d3f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Container.php
View file

@ -29,14 +29,14 @@ class Container extends Model
protected $hidden = ['created_at', 'deleted_at', 'updated_at']; protected $hidden = ['created_at', 'deleted_at', 'updated_at'];
static function all($columns=Array()){ static function all($columns=Array()){
return Container::join('items','items.cid','=','containers.cid') return Container::leftJoin('items','items.cid','=','containers.cid')
->select('items.cid', 'name', DB::raw('count(*) as itemCount')) ->select('containers.cid', 'name', DB::raw('count(items.iid) as itemCount'))
->groupBy('items.cid', 'name')->get(); ->groupBy('containers.cid', 'name')->get();
} }
static function find($id){ static function find($id){
return Container::join('items','items.cid','=','containers.cid') return Container::leftJoin('items','items.cid','=','containers.cid')
->select('items.cid', 'name', DB::raw('count(*) as itemCount')) ->select('containers.cid', 'name', DB::raw('count(items.iid) as itemCount'))
->groupBy('items.cid', 'name')->where('items.cid', '=', $id)->first(); ->groupBy('containers.cid', 'name')->where('items.cid', '=', $id)->first();
} }
} }