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 #4242 from bennothommo/fix/repeater-cleanup/bennothommo

Browse Source 
Additional fixes to #4234. Credit to @bennothommo
This commit is contained in:
Luke Towers 2019-04-11 11:09:13 -06:00 committed by GitHub
commit 81a5d2ff5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,13 @@ class Repeater extends FormWidgetBase
protected $groupDefinitions = [];
/**
* Determines if repeater has been initialised previously
*
* @var boolean
*/
protected $loaded = false;
/**
* @inheritDoc
*/
@ -95,6 +102,11 @@ class Repeater extends FormWidgetBase
$this->previewMode = true;
}
// Check for loaded flag in POST
if ((bool) post($this->alias . '_loaded') === true) {
$this->loaded = true;
}
$fieldName = $this->formField->getName(false);
$this->processGroupMode();
@ -197,8 +209,17 @@ class Repeater extends FormWidgetBase
*/
protected function processItems()
{
$indexes = $groups = [];
$currentValue = post($this->formField->getName(), $this->getLoadValue());
$currentValue = ($this->loaded === true)
? post($this->formField->getName())
: $this->getLoadValue();
if ($currentValue === null) {
$this->indexCount = 0;
$this->formWidgets = [];
return;
}
$groupMap = [];
// Ensure that the minimum number of items are preinitialized
// ONLY DONE WHEN NOT IN GROUP MODE
@ -215,26 +236,20 @@ class Repeater extends FormWidgetBase
}
}
if (is_array($currentValue)) {
foreach ($currentValue as $index => $value) {
$indexes[] = $index;
$groups[] = array_get($value, '_group');
if (is_array($currentValue) && count($currentValue)) {
foreach ($currentValue as $value) {
$groupMap[] = array_get($value, '_group');
}
}
if (!count($indexes)) {
if (!count($groupMap)) {
return;
}
$items = array_combine(
(array) $indexes,
(array) ($this->useGroups ? $groups : $indexes)
);
foreach ($items as $index => $groupCode) {
foreach ($groupMap as $index => $groupCode) {
$this->makeItemFormWidget($index, $groupCode);
$this->indexCount = max((int) $index, $this->indexCount);
}
$this->indexCount = max(count($currentValue), $this->indexCount);
}
/**
@ -275,7 +290,10 @@ class Repeater extends FormWidgetBase
*/
protected function getValueFromIndex($index)
{
$value = post($this->formField->fieldName, $this->getLoadValue());
$value = ($this->loaded === true)
? post($this->formField->getName())
: $this->getLoadValue();
if (!is_array($value)) {
$value = [];
}
@ -291,16 +309,20 @@ class Repeater extends FormWidgetBase
{
self::$onAddItemCalled = true;
$this->indexCount++;
$groupCode = post('_repeater_group');
$this->prepareVars();
$this->vars['widget'] = $this->makeItemFormWidget($this->indexCount, $groupCode);
$this->vars['indexValue'] = $this->indexCount;
$itemContainer = '@#'.$this->getId('items');
return [$itemContainer => $this->makePartial('repeater_item')];
$itemContainer = '@#' . $this->getId('items');
// Increase index count after item is created
++$this->indexCount;
return [
$itemContainer => $this->makePartial('repeater_item')
];
}
public function onRemoveItem()

2
modules/backend/formwidgets/repeater/partials/_repeater.htm
View File

@ -34,6 +34,8 @@
</a>
<?php endif ?>
</div>
<input type="hidden" name="<?= $this->alias; ?>_loaded" value="1">
<?php endif ?>
<script type="text/template" data-group-palette-template>