cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

chg: [component:CRUD] Better validation messages

pull/93/head
Sami Mokaddem 2022-03-01 09:51:51 +01:00
parent 4b5b2bc7e2
commit 713f867082
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Controller/Component/CRUDComponent.php
View File

@ -297,7 +297,7 @@ class CRUDComponent extends Component
$message = __( $message = __(
'{0} could not be added.{1}', '{0} could not be added.{1}',
$this->ObjectAlias, $this->ObjectAlias,
empty($validationMessage) ? '' : PHP_EOL . __('Reason:{0}', $validationMessage) empty($validationMessage) ? '' : PHP_EOL . __('Reason: {0}', $validationMessage)
); );
if ($this->Controller->ParamHandler->isRest()) { if ($this->Controller->ParamHandler->isRest()) {
$this->Controller->restResponsePayload = $this->RestResponse->viewData($message, 'json'); $this->Controller->restResponsePayload = $this->RestResponse->viewData($message, 'json');
@ -338,12 +338,19 @@ class CRUDComponent extends Component
$errorMessages = []; $errorMessages = [];
foreach ($errorData as $key => $value) { foreach ($errorData as $key => $value) {
if (is_array($value)) { if (is_array($value)) {
$errorMessages[] = implode('& ', Hash::extract($value, "{s}.{s}")); $extracted = Hash::extract($value, "{s}.{s}");
if (!empty($extracted)) {
$errorMessages[] = implode('& ', $extracted);
}
} else { } else {
$errorMessages[] = $value; if (!empty($value)) {
$errorMessages[] = $value;
}
} }
} }
$validationMessage .= __('{0}: {1}', $field, implode(',', $errorMessages)); if (!empty($errorMessages)) {
$validationMessage .= __('{0}: {1}', $field, implode(',', $errorMessages));
}
} }
} }
return $validationMessage; return $validationMessage;
@ -552,7 +559,7 @@ class CRUDComponent extends Component
$message = __( $message = __(
'{0} could not be modified.{1}', '{0} could not be modified.{1}',
$this->ObjectAlias, $this->ObjectAlias,
empty($validationMessage) ? '' : PHP_EOL . __('Reason:{0}', $validationMessage) empty($validationMessage) ? '' : PHP_EOL . __('Reason: {0}', $validationMessage)
); );
if ($this->Controller->ParamHandler->isRest()) { if ($this->Controller->ParamHandler->isRest()) {
} else if ($this->Controller->ParamHandler->isAjax()) { } else if ($this->Controller->ParamHandler->isAjax()) {
@ -1373,7 +1380,7 @@ class CRUDComponent extends Component
$message = __( $message = __(
'{0} could not be modified.{1}', '{0} could not be modified.{1}',
$this->ObjectAlias, $this->ObjectAlias,
empty($validationMessage) ? '' : ' ' . __('Reason:{0}', $validationMessage) empty($validationMessage) ? '' : ' ' . __('Reason: {0}', $validationMessage)
); );
if ($this->Controller->ParamHandler->isRest()) { if ($this->Controller->ParamHandler->isRest()) {
} else if ($this->Controller->ParamHandler->isAjax()) { } else if ($this->Controller->ParamHandler->isAjax()) {