Merge branch 'development' into staging

viktorcsimma · viktorcsimma · commit fa62c52eee46 · 2024-09-06T13:24:43.000+02:00
diff --git a/app/Http/Controllers/Dormitory/Reservations/ReservableItemController.php b/app/Http/Controllers/Dormitory/Reservations/ReservableItemController.php
@@ -33,7 +33,7 @@ public function index(Request $request)
         ]);
 
         $stringType = $validatedData['type'];
-        $this->authorize('requestReservationForType', [
+        $this->authorize('viewType', [
             ReservableItem::class,
             ReservableItemType::from($stringType)
         ]);
diff --git a/app/Policies/ReservableItemPolicy.php b/app/Policies/ReservableItemPolicy.php
@@ -93,7 +93,7 @@ public function viewType(User $user, ReservableItemType $type): bool
                 case ReservableItemType::WASHING_MACHINE:
                     return $user->hasRole([Role::COLLEGIST, Role::TENANT, Role::RECEPTIONIST]);
                 case ReservableItemType::ROOM:
-                    return $user->hasRole([Role::COLLEGIST, Role::RECEPTIONIST]);
+                    return $user->hasRole([Role::COLLEGIST, Role::WORKSHOP_LEADER, Role::RECEPTIONIST]);
                 default:
                     throw new \Exception("unknown ReservableItemType");
             }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function viewType(User $user, ReservableItemType $type): bool`
`93`	`93`	`case ReservableItemType::WASHING_MACHINE:`
`94`	`94`	`return $user->hasRole([Role::COLLEGIST, Role::TENANT, Role::RECEPTIONIST]);`
`95`	`95`	`case ReservableItemType::ROOM:`
`96`		`- return $user->hasRole([Role::COLLEGIST, Role::RECEPTIONIST]);`
	`96`	`+ return $user->hasRole([Role::COLLEGIST, Role::WORKSHOP_LEADER, Role::RECEPTIONIST]);`
`97`	`97`	`default:`
`98`	`98`	`throw new \Exception("unknown ReservableItemType");`
`99`	`99`	`}`