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

Fix issue processwire/processwire-issues#236 with InputfieldSelector, plus update the "None" selection option to fix another issue reported in ListerPro board

Browse Source
This commit is contained in:
Ryan Cramer
2017-04-10 08:23:45 -04:00
parent 168a4ffa58
commit 81c8d4eb2f
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.module
View File

@@ -260,12 +260,13 @@ class InputfieldSelector extends Inputfield implements ConfigurableModule {
if(!$this->wire('user')->isLoggedin()) return; if(!$this->wire('user')->isLoggedin()) return;
$this->set('initValue', $this->sessionGet('initValue')); $this->set('initValue', $this->sessionGet('initValue'));
$this->setup();
$sanitizer = $this->wire('sanitizer'); $sanitizer = $this->wire('sanitizer');
foreach($this->sessionVarNames as $key) { foreach($this->sessionVarNames as $key) {
$this->set($key, $this->sessionGet($key)); $this->set($key, $this->sessionGet($key));
} }
$this->setup();
if($action == 'field') { if($action == 'field') {
$out = $this->renderSelectField(); $out = $this->renderSelectField();
@@ -1273,8 +1274,16 @@ class InputfieldSelector extends Inputfield implements ConfigurableModule {
if($type != 'checkbox' && !isset($this->systemFields[$fieldName]) && !isset($this->modifierFields[$fieldName])) { if($type != 'checkbox' && !isset($this->systemFields[$fieldName]) && !isset($this->modifierFields[$fieldName])) {
// allow for a "None" option to find pages that have no selections for the field // allow for a "None" option to find pages that have no selections for the field
$selected = $selectedValue == '""' ? ' selected' : ''; $none = '0';
$out .= "<option$selected value='\"\"'>" . $this->_('None') . "</option>"; foreach($options as $value => $label) {
// if select is using "0" as a literal selectable value, don't consider it as "None"
if($value === 0 || $value === '0') {
$none = '""';
break;
}
}
$selected = $selectedValue == $none || $selectedValue == '""' ? ' selected' : '';
$out .= "<option$selected value='$none'>" . $this->_('None') . "</option>";
} }
// render each option // render each option