From: thepurpleblob Date: Wed, 9 Jul 2008 10:26:13 +0000 (+0000) Subject: MDL-15571: X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=906ebc4b66770a56b95a408b4dcefc7e93326552;p=moodle.git MDL-15571: Now substitutes for group templates --- diff --git a/lib/formslib.php b/lib/formslib.php index 79457ecee3..e8cd5789a5 100644 --- a/lib/formslib.php +++ b/lib/formslib.php @@ -1702,7 +1702,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{ } function renderElement(&$element, $required, $error){ - //manipulate id of all elements before rendering + //manipulate id of all elements before rendering if (!is_null($element->getAttribute('id'))) { $id = $element->getAttribute('id'); } else { @@ -1715,7 +1715,12 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{ } //adding stuff to place holders in template - if (method_exists($element, 'getElementTemplateType')){ + //check if this is a group element first + if (($this->_inGroup) and !empty($this->_groupElementTemplate)) { + // so it gets substitutions for *each* element + $html = $this->_groupTemplates[$element->getName()]; + } + elseif (method_exists($element, 'getElementTemplateType')){ $html = $this->_elementTemplates[$element->getElementTemplateType()]; }else{ $html = $this->_elementTemplates['default']; @@ -1743,10 +1748,13 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{ $html = str_replace('{help}', '', $html); } - if (!isset($this->_templates[$element->getName()])) { - $this->_templates[$element->getName()] = $html; + if (($this->_inGroup) and !empty($this->_groupElementTemplate)) { + $this->_groupElementTemplate = $html; } - + elseif (!isset($this->_templates[$element->getName()])) { + $this->_templates[$element->getName()] = $html; + } + parent::renderElement($element, $required, $error); }