z-song /
laravel-admin
| @@ 256-271 (lines=16) @@ | ||
| 253 | $attributes = $array_clean_merge($attributes, $newAttributes); |
|
| 254 | } |
|
| 255 | ||
| 256 | if ($field->validationMessages) { |
|
| 257 | $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) { |
|
| 258 | list($r, $k, $c) = explode('.', $v); |
|
| 259 | //Fix ResetInput Function! A Headache Implementation! |
|
| 260 | $col = explode(':', $c)[0]; |
|
| 261 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
|
| 262 | return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field, $array_key_attach_str) { |
|
| 263 | return $array_key_attach_str($field->validationMessages, "{$v}:{$u}"); |
|
| 264 | }, array_keys($availInput[$k][$col]))); |
|
| 265 | } |
|
| 266 | ||
| 267 | return $array_key_attach_str($field->validationMessages, $v); |
|
| 268 | }, $newColumn); |
|
| 269 | $messages = $array_clean_merge($messages, $newMessages); |
|
| 270 | } |
|
| 271 | } |
|
| 272 | ||
| 273 | $rules = array_filter($rules, 'strlen'); |
|
| 274 | if (empty($rules)) { |
|
| @@ 364-379 (lines=16) @@ | ||
| 361 | return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}"; |
|
| 362 | }, array_keys($columns), array_values($columns)); |
|
| 363 | ||
| 364 | if ($field->validationMessages) { |
|
| 365 | $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) { |
|
| 366 | list($k, $c) = explode('.', $v); |
|
| 367 | //Fix ResetInput Function! A Headache Implementation! |
|
| 368 | $col = explode(':', $c)[0]; |
|
| 369 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
|
| 370 | return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field, $array_key_attach_str) { |
|
| 371 | return $array_key_attach_str($field->validationMessages, "{$v}:{$u}"); |
|
| 372 | }, array_keys($availInput[$k][$col]))); |
|
| 373 | } |
|
| 374 | ||
| 375 | //May Have Problem in Dealing with File Upload in Edit Mode |
|
| 376 | return $array_key_attach_str($field->validationMessages, $v); |
|
| 377 | }, $newColumn); |
|
| 378 | $messages = $array_clean_merge($messages, $newMessages); |
|
| 379 | } |
|
| 380 | } |
|
| 381 | ||
| 382 | return $messages; |
|
