z-song /
laravel-admin
| @@ 277-291 (lines=15) @@ | ||
| 274 | $attributes = array_clean_merge($attributes, $newAttributes); |
|
| 275 | } |
|
| 276 | ||
| 277 | if ($field->validationMessages) { |
|
| 278 | $newMessages = array_map(function ($v) use ($field, $availInput) { |
|
| 279 | list($r, $k, $c) = explode('.', $v); |
|
| 280 | //Fix ResetInput Function! A Headache Implementation! |
|
| 281 | $col = explode(':', $c)[0]; |
|
| 282 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
|
| 283 | return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field) { |
|
| 284 | return array_key_attach_str($field->validationMessages, "{$v}:{$u}"); |
|
| 285 | }, array_keys($availInput[$k][$col]))); |
|
| 286 | } |
|
| 287 | ||
| 288 | return array_key_attach_str($field->validationMessages, $v); |
|
| 289 | }, $newColumn); |
|
| 290 | $messages = array_clean_merge($messages, $newMessages); |
|
| 291 | } |
|
| 292 | } |
|
| 293 | ||
| 294 | $rules = array_filter($rules, 'strlen'); |
|
| @@ 404-425 (lines=22) @@ | ||
| 401 | return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}"; |
|
| 402 | }, array_keys($columns), array_values($columns)); |
|
| 403 | ||
| 404 | if ($field->validationMessages) { |
|
| 405 | $newMessages = array_map(function ($v) use ($field, $availInput) { |
|
| 406 | list($k, $c) = explode('.', $v); |
|
| 407 | //Fix ResetInput Function! A Headache Implementation! |
|
| 408 | $col = explode(':', $c)[0]; |
|
| 409 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
|
| 410 | return call_user_func_array( |
|
| 411 | 'array_merge', |
|
| 412 | array_map(function ($u) use ( |
|
| 413 | $v, |
|
| 414 | $field |
|
| 415 | ) { |
|
| 416 | return array_key_attach_str($field->validationMessages, "{$v}:{$u}"); |
|
| 417 | }, array_keys($availInput[$k][$col])) |
|
| 418 | ); |
|
| 419 | } |
|
| 420 | ||
| 421 | //May Have Problem in Dealing with File Upload in Edit Mode |
|
| 422 | return array_key_attach_str($field->validationMessages, $v); |
|
| 423 | }, $newColumn); |
|
| 424 | $messages = array_clean_merge($messages, $newMessages); |
|
| 425 | } |
|
| 426 | } |
|
| 427 | ||
| 428 | return $messages; |
|
