From 6ed1c098d6f59aff35ca866acbd362c248c4d9e0 Mon Sep 17 00:00:00 2001
From: Maxim Leshchenko <cnmaks90@gmail.com>
Date: Fri, 12 Nov 2021 13:59:56 +0200
Subject: [PATCH] Another code improvements

---
 Web/Models/Entities/Club.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/Web/Models/Entities/Club.php b/Web/Models/Entities/Club.php
index 8442967d..5c42e7b7 100644
--- a/Web/Models/Entities/Club.php
+++ b/Web/Models/Entities/Club.php
@@ -276,11 +276,9 @@ class Club extends RowModel
     
     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) {
             $rel = (new Managers)->get($rel->id);
@@ -294,9 +292,8 @@ class Club extends RowModel
     {
         $manager = (new Managers)->getByUserAndClub($user->getId(), $this->getId());
 
-        if ($ignoreHidden && $manager !== null && $manager->isHidden()) {
-            $manager = null;
-        }
+        if ($ignoreHidden && $manager !== null && $manager->isHidden())
+            return null;
 
         return $manager;
     }