From 5682bd03f884cf4bf26f45e94e45344c9d136499 Mon Sep 17 00:00:00 2001 From: HDVinnie Date: Sun, 14 Apr 2024 20:25:09 -0400 Subject: [PATCH] update: rules --- app/Http/Requests/Staff/StoreGroupRequest.php | 20 +++++++++---------- .../Requests/Staff/UpdateGroupRequest.php | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/Http/Requests/Staff/StoreGroupRequest.php b/app/Http/Requests/Staff/StoreGroupRequest.php index 23d859f556..622a06b958 100644 --- a/app/Http/Requests/Staff/StoreGroupRequest.php +++ b/app/Http/Requests/Staff/StoreGroupRequest.php @@ -113,39 +113,39 @@ public function rules(Request $request): array 'boolean', ], 'min_uploaded' => [ - Rule::when((bool) $request->integer('autogroup'), [ + Rule::when($request->boolean('autogroup'), [ 'sometimes', 'integer', 'min:0', - ]), + ], 'prohibited'), ], 'min_ratio' => [ - Rule::when((bool) $request->integer('autogroup'), [ + Rule::when($request->boolean('autogroup'), [ 'sometimes', 'min:0', 'max:99.99', - ]), + ], 'prohibited'), ], 'min_age' => [ - Rule::when((bool) $request->integer('autogroup'), [ + Rule::when($request->boolean('autogroup'), [ 'sometimes', 'integer', 'min:0', - ]), + ], 'prohibited'), ], 'min_avg_seedtime' => [ - Rule::when((bool) $request->integer('autogroup'), [ + Rule::when($request->boolean('autogroup'), [ 'sometimes', 'integer', 'min:0', - ]), + ], 'prohibited'), ], 'min_seedsize' => [ - Rule::when((bool) $request->integer('autogroup'), [ + Rule::when($request->boolean('autogroup'), [ 'sometimes', 'integer', 'min:0', - ]), + ], 'prohibited'), ], ]; } diff --git a/app/Http/Requests/Staff/UpdateGroupRequest.php b/app/Http/Requests/Staff/UpdateGroupRequest.php index 6c9b53c746..d411075b4e 100644 --- a/app/Http/Requests/Staff/UpdateGroupRequest.php +++ b/app/Http/Requests/Staff/UpdateGroupRequest.php @@ -119,39 +119,39 @@ public function rules(Request $request): array 'boolean', ], 'min_uploaded' => [ - Rule::when((bool) $group->autogroup, [ + Rule::when($request->boolean('autogroup'), [ 'sometimes', 'integer', 'min:0', - ]), + ], 'nullable'), ], 'min_ratio' => [ - Rule::when((bool) $group->autogroup, [ + Rule::when($request->boolean('autogroup'), [ 'sometimes', 'min:0', 'max:99.99', - ]), + ], 'nullable'), ], 'min_age' => [ - Rule::when((bool) $group->autogroup, [ + Rule::when($request->boolean('autogroup'), [ 'sometimes', 'integer', 'min:0', - ]), + ], 'nullable'), ], 'min_avg_seedtime' => [ - Rule::when((bool) $group->autogroup, [ + Rule::when($request->boolean('autogroup'), [ 'sometimes', 'integer', 'min:0', - ]), + ], 'nullable'), ], 'min_seedsize' => [ - Rule::when((bool) $group->autogroup, [ + Rule::when($request->boolean('autogroup'), [ 'sometimes', 'integer', 'min:0', - ]), + ], 'nullable'), ], ]; }