DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 05:47:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

WIP: Future-proof rules being converted to array syntax

Browse source
This commit is contained in:
Marcus Moore 2024-04-24 17:40:40 -07:00
parent 12418ae91b
commit 3a2eeaea7a
No known key found for this signature in database
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/Http/Requests/StoreAssetRequest.php
View file

@ -47,9 +47,7 @@ class StoreAssetRequest extends ImageUploadRequest
{ {
$modelRules = (new Asset)->getRules(); $modelRules = (new Asset)->getRules();
$modelRules['purchase_cost'] = array_filter(explode('|', $modelRules['purchase_cost']), function ($rule) { $modelRules['purchase_cost'] = $this->removeNumericRulesFromPurchaseCost($modelRules['purchase_cost']);
return $rule !== 'numeric' && $rule !== 'gte:0';
});
$rules = array_merge( $rules = array_merge(
$modelRules, $modelRules,
@ -75,4 +73,16 @@ class StoreAssetRequest extends ImageUploadRequest
} }
} }
} }
private function removeNumericRulesFromPurchaseCost($purchaseCost)
{
// If rule is in "|" format then turn it into an array
if (is_string($purchaseCost)) {
$purchaseCost = explode('|', $purchaseCost);
}
return array_filter($purchaseCost, function ($rule) {
return $rule !== 'numeric' && $rule !== 'gte:0';
});
}
} }