mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-09 08:17:12 +02:00
Code Issues Releases Wiki Activity

Add support for dependent selects within repeater items. This works so long as the fields used by the dependent selects don't also appear again in the page editor outside of repeater fields.

Browse Source
This commit is contained in:
Ryan Cramer
2022-04-13 11:43:01 -04:00
parent 47f2742b72
commit 0fe1d7da76
1 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
wire/modules/Inputfield/InputfieldPage/InputfieldPage.module
View File

@@ -365,7 +365,7 @@ class InputfieldPage extends Inputfield implements ConfigurableModule {
} else if($findPagesSelector) { } else if($findPagesSelector) {
// a find() selector // a find() selector
$instance = $this->processInputMode ? $this : null; $instance = $this->processInputMode || strpos($findPagesSelector, '=page.') ? $this : null;
$selector = self::populateFindPagesSelector($page, $findPagesSelector, $instance); $selector = self::populateFindPagesSelector($page, $findPagesSelector, $instance);
$children = $pages->find($selector); $children = $pages->find($selector);
@@ -424,16 +424,23 @@ class InputfieldPage extends Inputfield implements ConfigurableModule {
// if an $inputfield is passed in, then we want to retrieve dependent values directly // if an $inputfield is passed in, then we want to retrieve dependent values directly
// from the form, rather than from the $page // from the form, rather than from the $page
$repeaterWrappers = array(); // 0, 1, or 2+ if nested repeaters
/** @var InputfieldWrapper $form */ /** @var InputfieldWrapper $form */
if($inputfield) { if($inputfield) {
// locate the $form // locate the $form
$n = 0; $n = 0;
$form = $inputfield; $form = $inputfield;
do { do {
$form = $form->getParent(); if($form instanceof InputfieldWrapper && $form->hasClass('InputfieldRepeaterItem')) {
$repeaterWrappers[] = $form;
}
$f = $form->getParent();
if($f) $form = $f;
if(++$n > 10) break; if(++$n > 10) break;
} while($form && $form->className() != 'InputfieldForm'); } while($f && $f->className() != 'InputfieldForm');
} else $form = null; } else {
$form = null;
}
// find variables identified by: page.field or page.field.subfield // find variables identified by: page.field or page.field.subfield
if(strpos($selector, '=page.') !== false) { if(strpos($selector, '=page.') !== false) {
@@ -445,8 +452,22 @@ class InputfieldPage extends Inputfield implements ConfigurableModule {
$value = null; $value = null;
if($form && (!$subfield || $subfield == 'id')) { if($form && (!$subfield || $subfield == 'id')) {
// attempt to get value from the form, to account for ajax changes that would not yet be reflected on the page // attempt to get value from the form, to account for ajax changes that would not yet be reflected on the page
$in = $form->getChildByName($field); $in = $form instanceof InputfieldWrapper ? $form->getChildByName($field) : null;
if($in) $value = $in->attr('value'); if($in) {
$value = $in->attr('value');
} else if(count($repeaterWrappers)) {
// fields in repeaters use a namespaced name attribute so match by hasField instead
foreach($repeaterWrappers as $repeaterWrapper) {
/** @var InputfieldWrapper $repeaterWrapper */
$value = null;
foreach($repeaterWrapper->getAll() as $in) {
if("$in->hasField" !== $field) continue;
$value = $in->val();
break;
}
if($value !== null) break;
}
}
} }
if(is_null($value)) $value = $page->get($field); if(is_null($value)) $value = $page->get($field);
if(is_object($value) && $subfield) $value = $value->$subfield; if(is_object($value) && $subfield) $value = $value->$subfield;
@@ -646,6 +667,13 @@ class InputfieldPage extends Inputfield implements ConfigurableModule {
} else if(method_exists($inputfield, 'addOption') || $inputfield instanceof InputfieldHasSelectableOptions) { } else if(method_exists($inputfield, 'addOption') || $inputfield instanceof InputfieldHasSelectableOptions) {
// All selectable options types // All selectable options types
if($this->hasPage && $this->hasPage->id != $page->id && wireInstanceOf($this->hasPage, 'RepeaterPage')) {
if($this->hasField && !$page->hasField($this->hasField) && $this->hasPage->hasField($this->hasField)) {
// replace page with RepeaterPage
$page = $this->hasPage;
$inputfield->set('hasPage', $page);
}
}
$children = $this->getSelectablePages($page); $children = $this->getSelectablePages($page);
@@ -681,7 +709,7 @@ class InputfieldPage extends Inputfield implements ConfigurableModule {
if(!empty($template_ids)) $inputfield->set('template_ids', $template_ids); if(!empty($template_ids)) $inputfield->set('template_ids', $template_ids);
if($findPagesSelector) { if($findPagesSelector) {
$inputfield->set('findPagesSelector', self::populateFindPagesSelector($page, $findPagesSelector)); $inputfield->set('findPagesSelector', self::populateFindPagesSelector($page, $findPagesSelector, $this));
} }
if(strlen($labelFieldFormat) && $labelFieldName === '.') { if(strlen($labelFieldFormat) && $labelFieldName === '.') {