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

Fix extra ‘for’ attribute issue in InputfieldWrapper (that had value ‘{for}’), plus add new removeByName() method for removing an Inputfield from the form by name.

Browse Source
This commit is contained in:
Ryan Cramer
2025-07-01 09:40:01 -04:00
parent 1b0d51e275
commit b579e24425
1 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
wire/core/InputfieldWrapper.php
View File

@@ -559,6 +559,27 @@ class InputfieldWrapper extends Inputfield implements \Countable, \IteratorAggre
return $this; return $this;
} }
/**
* Remove an Inputfield from the form by name
*
* Note that this works the same as the getByName/getChildByName methods in that it
* will find (and remove) the field by name, even if nested within other wrappers
* or fieldsets. It returns the removed Inputfield when found, or null if not.
*
* @param string $name
* @return Inputfield|null Removed Inputfield object on success, or null if not found
* @since 3.0.250
*
*/
public function removeByName($name) {
$f = $this->getByName((string) $name);
if(!$f) return null;
$parent = $f->getParent();
if(!$parent instanceof InputfieldWrapper) return null;
$parent->remove($f);
return $f;
}
/** /**
* Prepare children for rendering by creating any fieldset groups * Prepare children for rendering by creating any fieldset groups
* *
@@ -902,7 +923,11 @@ class InputfieldWrapper extends Inputfield implements \Countable, \IteratorAggre
} else { } else {
// label always visible // label always visible
$label = str_replace('{out}', $icon . $label . $toggle, $markup['item_label']); $label = str_replace('{out}', $icon . $label . $toggle, $markup['item_label']);
if($skipLabel !== Inputfield::skipLabelFor) $label = $this->setAttributeInMarkup('for', $for, $label, true); if($skipLabel === Inputfield::skipLabelFor) {
$label = $this->removeAttributeFromMarkup('for', $label);
} else {
$label = $this->setAttributeInMarkup('for', $for, $label, true);
}
} }
$headerClass = trim($inputfield->getSetting('headerClass') . " $classes[item_label]"); $headerClass = trim($inputfield->getSetting('headerClass') . " $classes[item_label]");
$label = $this->setAttributeInMarkup('class', $headerClass, $label); $label = $this->setAttributeInMarkup('class', $headerClass, $label);
@@ -1053,6 +1078,20 @@ class InputfieldWrapper extends Inputfield implements \Countable, \IteratorAggre
return $markup; return $markup;
} }
/**
* Remove named attribute from given markup
*
* @param string $name
* @param string $markup
* @return string
* @since 3.0.250
*
*/
protected function removeAttributeFromMarkup($name, $markup) {
if(stripos($markup, " $name=") === false) return $markup;
return preg_replace('!\s' . $name . '=["\'][^"\']*["\']!i', '', $markup);
}
/** /**
* Render Inputfield header actions * Render Inputfield header actions
* *