z-song /
laravel-admin
| @@ 370-385 (lines=16) @@ | ||
| 367 | return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}"; |
|
| 368 | }, array_keys($columns), array_values($columns)); |
|
| 369 | ||
| 370 | if ($field->validationMessages) { |
|
| 371 | $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) { |
|
| 372 | list($k, $c) = explode('.', $v); |
|
| 373 | //Fix ResetInput Function! A Headache Implementation! |
|
| 374 | $col = explode(':', $c)[0]; |
|
| 375 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
|
| 376 | return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field, $array_key_attach_str) { |
|
| 377 | return $array_key_attach_str($field->validationMessages, "{$v}:{$u}"); |
|
| 378 | }, array_keys($availInput[$k][$col]))); |
|
| 379 | } |
|
| 380 | ||
| 381 | //May Have Problem in Dealing with File Upload in Edit Mode |
|
| 382 | return $array_key_attach_str($field->validationMessages, $v); |
|
| 383 | }, $newColumn); |
|
| 384 | $messages = $array_clean_merge($messages, $newMessages); |
|
| 385 | } |
|
| 386 | } |
|
| 387 | ||
| 388 | return $messages; |
|
| @@ 284-299 (lines=16) @@ | ||
| 281 | $attributes = $array_clean_merge($attributes, $newAttributes); |
|
| 282 | } |
|
| 283 | ||
| 284 | if ($field->validationMessages) { |
|
| 285 | $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) { |
|
| 286 | list($r, $k, $c) = explode('.', $v); |
|
| 287 | //Fix ResetInput Function! A Headache Implementation! |
|
| 288 | $col = explode(':', $c)[0]; |
|
| 289 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
|
| 290 | return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field, $array_key_attach_str) { |
|
| 291 | return $array_key_attach_str($field->validationMessages, "{$v}:{$u}"); |
|
| 292 | }, array_keys($availInput[$k][$col]))); |
|
| 293 | } |
|
| 294 | ||
| 295 | //May Have Problem in Dealing with File Upload in Edit Mode |
|
| 296 | return $array_key_attach_str($field->validationMessages, $v); |
|
| 297 | }, $newColumn); |
|
| 298 | $messages = $array_clean_merge($messages, $newMessages); |
|
| 299 | } |
|
| 300 | } |
|
| 301 | ||
| 302 | $rules = array_filter($rules, 'strlen'); |
|
