diff --git a/app/Controllers/ValueSetField.php b/app/Controllers/ValueSetField.php index 75f33eb..9d8620c 100644 --- a/app/Controllers/ValueSetField.php +++ b/app/Controllers/ValueSetField.php @@ -100,14 +100,14 @@ class ValueSetField extends Controller { if (!$VSFldID) { return $this->failValidationErrors('VSFldID is required.'); } - $dataValueSetFld = $this->prepareData($input); + $dataValueSetFld = $this->prepareDataValueSetFld($input); - if (!$this->validateData($data, $this->rulesValueSetFld)) { + if (!$this->validateData($dataValueSetFld, $this->rulesValueSetFld)) { return $this->failValidationErrors( $this->validator->getErrors()); } $this->db->transStart(); - $this->db->table('valuesetfld')->where('VSFldID', $VSFldID)->update($data); + $this->db->table('valuesetfld')->where('VSFldID', $VSFldID)->update($dataValueSetFld); $this->db->transComplete(); if ($this->db->transStatus() === false) { @@ -161,13 +161,15 @@ class ValueSetField extends Controller { } } - private function prepareData(array $input, string $now, string $mode = 'create'): array { + private function prepareDataValueSetFld(array $input): array { $data = [ - "Vset" => $input['VSet'] ?? null, + "VSet" => $input['VSet'] ?? null, "VSName" => $input['VSName'] ?? null, "VSDesc" => $input['VSDesc'] ?? null ]; + if(!empty($input["VSFldID"])) { $data["VSFldID"]=$input["VSFldID"]; } + return $data; }