z-song /
laravel-admin
| @@ 189-204 (lines=16) @@ | ||
| 186 | }, $newColumn); |
|
| 187 | $attributes = $array_clean_merge($attributes, $newAttributes); |
|
| 188 | ||
| 189 | if ($field->validationMessages) { |
|
| 190 | $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) { |
|
| 191 | list($k, $c) = explode('.', $v); |
|
| 192 | //Fix ResetInput Function! A Headache Implementation! |
|
| 193 | $col = explode(':', $c)[0]; |
|
| 194 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
|
| 195 | return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field, $array_key_attach_str) { |
|
| 196 | return $array_key_attach_str($field->validationMessages, "{$v}:{$u}"); |
|
| 197 | }, array_keys($availInput[$k][$col]))); |
|
| 198 | } |
|
| 199 | ||
| 200 | //May Have Problem in Dealing with File Upload in Edit Mode |
|
| 201 | return $array_key_attach_str($field->validationMessages, $v); |
|
| 202 | }, $newColumn); |
|
| 203 | $messages = $array_clean_merge($messages, $newMessages); |
|
| 204 | } |
|
| 205 | } |
|
| 206 | ||
| 207 | $rules = array_filter($rules, 'strlen'); |
|
| @@ 219-234 (lines=16) @@ | ||
| 216 | }, $newColumn); |
|
| 217 | $attributes = $array_clean_merge($attributes, $newAttributes); |
|
| 218 | ||
| 219 | if ($field->validationMessages) { |
|
| 220 | $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) { |
|
| 221 | list($r, $k, $c) = explode('.', $v); |
|
| 222 | //Fix ResetInput Function! A Headache Implementation! |
|
| 223 | $col = explode(':', $c)[0]; |
|
| 224 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
|
| 225 | return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field, $array_key_attach_str) { |
|
| 226 | return $array_key_attach_str($field->validationMessages, "{$v}:{$u}"); |
|
| 227 | }, array_keys($availInput[$k][$col]))); |
|
| 228 | } |
|
| 229 | ||
| 230 | //May Have Problem in Dealing with File Upload in Edit Mode |
|
| 231 | return $array_key_attach_str($field->validationMessages, $v); |
|
| 232 | }, $newColumn); |
|
| 233 | $messages = $array_clean_merge($messages, $newMessages); |
|
| 234 | } |
|
| 235 | } |
|
| 236 | ||
| 237 | $rules = array_filter($rules, 'strlen'); |
|
