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

Fix issue processwire/processwire-issues#897

Browse Source
This commit is contained in:
Ryan Cramer
2019-06-26 10:43:03 -04:00
parent ab94e7b682
commit f6702407ff
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wire/modules/Inputfield/InputfieldPageAutocomplete/InputfieldPageAutocomplete.module
View File

@@ -146,6 +146,8 @@ class InputfieldPageAutocomplete extends Inputfield implements InputfieldHasArra
* *
*/ */
public function ___render() { public function ___render() {
/** @var Sanitizer $sanitizer */
$sanitizer = $this->wire('sanitizer');
if($this->maxSelectedItems == 1) $this->useList = false; if($this->maxSelectedItems == 1) $this->useList = false;
$out = $this->useList ? $this->renderList() : ''; $out = $this->useList ? $this->renderList() : '';
@@ -160,12 +162,12 @@ class InputfieldPageAutocomplete extends Inputfield implements InputfieldHasArra
// @esrch pr#994 -- // @esrch pr#994 --
if(strpos($name, '.')) { if(strpos($name, '.')) {
list($name, $subname) = explode('.', $name); list($name, $subname) = explode('.', $name);
$name = $this->wire('sanitizer')->fieldName($name); $name = $sanitizer->fieldName($name);
$subname = $this->wire('sanitizer')->fieldName($subname); $subname = $sanitizer->fieldName($subname);
if($name && $subname) $name .= "-$subname"; if($name && $subname) $name .= "-$subname";
// -- pr#994 // -- pr#994
} else { } else {
$name = $this->wire('sanitizer')->fieldName($name); $name = $sanitizer->fieldName($name);
} }
if($name) $searchField .= ($searchField ? ',' : '') . $name; if($name) $searchField .= ($searchField ? ',' : '') . $name;
} }
@@ -195,8 +197,8 @@ class InputfieldPageAutocomplete extends Inputfield implements InputfieldHasArra
$attrs = $attrs =
"data-max='$max' " . "data-max='$max' " .
"data-url='" . $this->wire('sanitizer')->entities($url) . "' " . "data-url='" . $sanitizer->entities($url) . "' " .
"data-label='" . $this->wire('sanitizer')->entities($labelField) . "' " . "data-label='" . $sanitizer->entities($labelField) . "' " .
"data-search='$searchField' " . "data-search='$searchField' " .
"data-operator='$operator'"; "data-operator='$operator'";
@@ -209,19 +211,20 @@ class InputfieldPageAutocomplete extends Inputfield implements InputfieldHasArra
$textValue = $this->labelFieldFormat ? $item->getText($this->labelFieldFormat, true, false) : $item->get($labelField); $textValue = $this->labelFieldFormat ? $item->getText($this->labelFieldFormat, true, false) : $item->get($labelField);
if(!strlen($textValue)) $textValue = $item->get('title|name'); if(!strlen($textValue)) $textValue = $item->get('title|name');
$textValue = strip_tags($textValue); $textValue = strip_tags($textValue);
if(strpos($textValue, '&') !== false) $textValue = $this->wire('sanitizer')->unentities($textValue); if(strpos($textValue, '&') !== false) $textValue = $sanitizer->unentities($textValue);
$textValue = $this->wire('sanitizer')->entities($textValue); $textValue = $sanitizer->entities($textValue);
} }
} }
$remove = "<i class='fa fa-fw fa-times-circle InputfieldPageAutocompleteRemove'></i>"; $remove = "<i class='fa fa-fw fa-times-circle InputfieldPageAutocompleteRemove'></i>";
} }
$addingLabel = $this->wire('sanitizer')->entities1($this->_('New item:')); $addingLabel = $sanitizer->entities1($this->_('New item:'));
$dataClass = $sanitizer->entities(trim('InputfieldPageAutocompleteData ' . $this->attr('class')));
$out .= <<< _OUT $out .= <<< _OUT
<p> <p>
<input type='hidden' name='{$this->name}[]' id='$id' class='InputfieldPageAutocompleteData' value='$value' $attrs/> <input type='hidden' name='{$this->name}[]' id='$id' class='$dataClass' value='$value' $attrs/>
<input type='text' data-parent-input='$id' id='{$id}_input' class='$class' value='$textValue' $disableChars/> <input type='text' data-parent-input='$id' id='{$id}_input' class='$class' value='$textValue' $disableChars/>
<i class='fa fa-fw fa-angle-double-right InputfieldPageAutocompleteStatus'></i> <i class='fa fa-fw fa-angle-double-right InputfieldPageAutocompleteStatus'></i>
$remove $remove