mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4336 from octobercms/master

Browse Source 
Fix group index mapping in Repeater widget (#4334)
This commit is contained in:
Luke Towers 2019-05-14 12:29:09 -06:00 committed by GitHub
commit bcd5156497
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/backend/formwidgets/Repeater.php
View File

@ -217,9 +217,7 @@ class Repeater extends FormWidgetBase
$this->indexCount = 0;
$this->formWidgets = [];
return;
}
$groupMap = [];
}
// Ensure that the minimum number of items are preinitialized
// ONLY DONE WHEN NOT IN GROUP MODE
@ -235,20 +233,15 @@ class Repeater extends FormWidgetBase
}
}
}
if (is_array($currentValue) && count($currentValue)) {
foreach ($currentValue as $value) {
$groupMap[] = array_get($value, '_group');
}
}
if (!count($groupMap)) {
if (!is_array($currentValue)) {
return;
}
foreach ($groupMap as $index => $groupCode) {
$this->makeItemFormWidget($index, $groupCode);
}
collect($currentValue)->each(function ($value, $index) {
$this->makeItemFormWidget($index, array_get($value, '_group', null));
});
$this->indexCount = max(count($currentValue), $this->indexCount);
}