Merge branch 'master' into testing

HKFree · Jan 13, 2025 · ca197ea · ca197ea
2 parents 15378d4 + 4390614
commit ca197ea
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/app/model/UzivatelListGrid.php b/app/model/UzivatelListGrid.php
@@ -88,7 +88,7 @@ public function getListOfOtherUsersGrid($presenter, $name, $loggedUser, $id, $mo
                     return $tr;
                 }
                 // TODO: spolek / druzstvo
-                if ($item->TypClenstvi_id == 2) {
+                if ($item->spolek && $item->TypClenstvi_id == 2) {
                     $tr->class[] = 'primarni';
                 }
                 return $tr;
@@ -103,12 +103,12 @@ public function getListOfOtherUsersGrid($presenter, $name, $loggedUser, $id, $mo
                     $tr->class[] = 'cestne';
                     return $tr;
                 }
-                // TODO: spolek / druzstvo
-                if ($item->TypClenstvi_id == 2) {
+                if ($item->spolek && $item->TypClenstvi_id == 2) {
                     $tr->class[] = 'primarni';
                 }
-                // TODO: spolek / druzstvo
-                if ($item->TypClenstvi_id == 1) {
+                if ($item->spolek && $item->TypClenstvi_id == 1 && (!$item->druzstvo)
+                    || $item->druzstvo && $item->smazano && (!$item->spolek)
+                    || $item->spolek && $item->druzstvo && $item->TypClenstvi_id == 1 && $item->smazano) {
                     $tr->class[] = 'zrusene';
                 }
                 if ($item->TypClenstvi_id === 0) {