Another code improvements

This commit is contained in:
Maxim Leshchenko 2021-11-12 13:59:56 +02:00
parent 41200d8b8f
commit 6ed1c098d6

View file

@ -276,11 +276,9 @@ class Club extends RowModel
function getManagers(int $page = 1, bool $ignoreHidden = false): \Traversable function getManagers(int $page = 1, bool $ignoreHidden = false): \Traversable
{ {
if($ignoreHidden) {
$rels = $this->getRecord()->related("group_coadmins.club")->where("hidden", false)->page($page, 6);
} else {
$rels = $this->getRecord()->related("group_coadmins.club")->page($page, 6); $rels = $this->getRecord()->related("group_coadmins.club")->page($page, 6);
} if($ignoreHidden)
$rels = $rels->where("hidden", false);
foreach($rels as $rel) { foreach($rels as $rel) {
$rel = (new Managers)->get($rel->id); $rel = (new Managers)->get($rel->id);
@ -294,9 +292,8 @@ class Club extends RowModel
{ {
$manager = (new Managers)->getByUserAndClub($user->getId(), $this->getId()); $manager = (new Managers)->getByUserAndClub($user->getId(), $this->getId());
if ($ignoreHidden && $manager !== null && $manager->isHidden()) { if ($ignoreHidden && $manager !== null && $manager->isHidden())
$manager = null; return null;
}
return $manager; return $manager;
} }