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

Fix issue processwire/processwire-issues#24 findPagesSelector containing "=page.id" when used outside original intended context, fix ensures it continues to work without dependent selects

Browse Source
This commit is contained in:
Ryan Cramer
2016-10-06 10:41:59 -04:00
parent cb3e8f741b
commit ba44b4bf20
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,7 +365,7 @@ 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->get($field); $in = $form->getChildByName($field);
if($in) $value = $in->attr('value'); if($in) $value = $in->attr('value');
} }
if(is_null($value)) $value = $page->get($field); if(is_null($value)) $value = $page->get($field);
@@ -374,6 +374,7 @@ class InputfieldPage extends Inputfield implements ConfigurableModule {
$selector = str_replace($tag, "=$value", $selector); $selector = str_replace($tag, "=$value", $selector);
} }
} }
return $selector; return $selector;
} }
@@ -469,7 +470,10 @@ class InputfieldPage extends Inputfield implements ConfigurableModule {
} }
if($template_id) $inputfield->template_id = $template_id; if($template_id) $inputfield->template_id = $template_id;
if($findPagesSelector) $inputfield->findPagesSelector = $findPagesSelector;
if($findPagesSelector) {
$inputfield->findPagesSelector = self::getFindPagesSelector($page, $findPagesSelector);
}
if(strlen($labelFieldFormat) && $labelFieldName === '.') { if(strlen($labelFieldFormat) && $labelFieldName === '.') {
$inputfield->labelFieldName = $labelFieldFormat; $inputfield->labelFieldName = $labelFieldFormat;