Skip to content

Commit 28be871

Browse files
committed
improve subfield handling
1 parent c39ccb8 commit 28be871

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/app/Library/CrudPanel/Traits/FieldsProtectedMethods.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,14 @@ protected function inferFieldTypeFromRelationType($relationType)
254254
*/
255255
protected function makeSureSubfieldsHaveNecessaryAttributes($field)
256256
{
257-
if (! isset($field['subfields'])) {
257+
if (! isset($field['subfields']) || ! is_array($field['subfields'])) {
258258
return $field;
259259
}
260260

261+
if(! is_multidimensional_array($field['subfields'])) {
262+
$field['subfields'] = [$field['subfields']];
263+
}
264+
261265
foreach ($field['subfields'] as $key => $subfield) {
262266
if (empty($subfield) || ! isset($subfield['name'])) {
263267
abort(500, 'Subfield name can\'t be empty');

0 commit comments

Comments
 (0)