Merge remote-tracking branch 'origin/develop'

snipe · snipe · commit ee82c70582c0 · 2025-05-15T18:32:05.000+02:00
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
@@ -1141,8 +1141,8 @@ public function audit(Request $request, Asset $asset): JsonResponse
                 }
             }
 
-            // Validate custom fields
-            Validator::make($asset->toArray(), $asset->customFieldValidationRules())->validate();
+            // Invoke the validation to see if the audit will complete successfully
+            $asset->setRules($asset->getRules() + $asset->customFieldValidationRules());
 
             // Validate the rest of the data before we turn off the event dispatcher
             if ($asset->isInvalid()) {

Original file line number	Diff line number	Diff line change
`@@ -1141,8 +1141,8 @@ public function audit(Request $request, Asset $asset): JsonResponse`
`1141`	`1141`	`}`
`1142`	`1142`	`}`
`1143`	`1143`
`1144`		`- // Validate custom fields`
`1145`		`- Validator::make($asset->toArray(), $asset->customFieldValidationRules())->validate();`
	`1144`	`+ // Invoke the validation to see if the audit will complete successfully`
	`1145`	`+ $asset->setRules($asset->getRules() + $asset->customFieldValidationRules());`
`1146`	`1146`
`1147`	`1147`	`// Validate the rest of the data before we turn off the event dispatcher`
`1148`	`1148`	`if ($asset->isInvalid()) {`