DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

make some naming a little clearer

Browse source
This commit is contained in:
spencerrlongg 2024-07-09 16:32:44 -05:00
parent 1a1ccd6bdc
commit 6932a63217
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Controllers/AssetModelsController.php
View file

@ -8,6 +8,7 @@ use App\Http\Requests\StoreAssetModelRequest;
use App\Models\Actionlog; use App\Models\Actionlog;
use App\Models\AssetModel; use App\Models\AssetModel;
use App\Models\CustomField; use App\Models\CustomField;
use App\Models\SnipeModel;
use App\Models\User; use App\Models\User;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
@ -457,7 +458,7 @@ class AssetModelsController extends Controller
* @param AssetModel $model * @param AssetModel $model
* @param array $defaultValues * @param array $defaultValues
*/ */
private function assignCustomFieldsDefaultValues(AssetModel $model, array $defaultValues): bool private function assignCustomFieldsDefaultValues(AssetModel|SnipeModel $model, array $defaultValues): bool
{ {
$data = array(); $data = array();
foreach ($defaultValues as $customFieldId => $defaultValue) { foreach ($defaultValues as $customFieldId => $defaultValue) {
@ -466,17 +467,17 @@ class AssetModelsController extends Controller
$data[$customField->db_column] = $defaultValue; $data[$customField->db_column] = $defaultValue;
} }
$fieldsets = $model->fieldset->validation_rules(); $allRules = $model->fieldset->validation_rules();
$rules = array(); $rules = array();
foreach ($fieldsets as $fieldset => $validation){ foreach ($allRules as $field => $validation) {
// If the field is marked as required, eliminate the rule so it doesn't interfere with the default values // If the field is marked as required, eliminate the rule so it doesn't interfere with the default values
// (we are at model level, the rule still applies when creating a new asset using this model) // (we are at model level, the rule still applies when creating a new asset using this model)
$index = array_search('required', $validation); $index = array_search('required', $validation);
if ($index !== false){ if ($index !== false){
$validation[$index] = 'nullable'; $validation[$index] = 'nullable';
} }
$rules[$fieldset] = $validation; $rules[$field] = $validation;
} }
$validator = Validator::make($data, $rules); $validator = Validator::make($data, $rules);
@ -499,7 +500,7 @@ class AssetModelsController extends Controller
* Removes all default values * Removes all default values
* *
*/ */
private function removeCustomFieldsDefaultValues(AssetModel $model) : void private function removeCustomFieldsDefaultValues(AssetModel|SnipeModel $model): void
{ {
$model->defaultValues()->detach(); $model->defaultValues()->detach();
} }