L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-85825-main' of https://github.com/Jayce0808/moodle

Browse Source
This commit is contained in:
Huong Nguyen
2025-07-16 10:13:00 +07:00
parent a4cb3e35be 889a9b6af0
commit f4b1cf272a
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/customfield/field/number/classes/field_controller.php
+1 -1
View File
@@ -76,7 +76,7 @@ class field_controller extends \core_customfield\field_controller {
$mform->setType('configdata[decimalplaces]', PARAM_INT);
// Display format settings.
// TODO: Change this after MDL-82996 fixed.
// TODO: Change this after MDL-85825 fixed.
$randelname = 'str_display_format';
$mform->addGroup([], $randelname, html_writer::tag('h4', get_string('headerdisplaysettings', 'customfield_number')));
public/lib/behat/classes/partial_named_selector.php
+1 -1
View File
@@ -283,7 +283,7 @@ XPATH
, 'form_row' => <<<XPATH
.//*[contains(concat(' ', @class, ' '), ' col-form-label ')]
[normalize-space(.)= %locator%]
/ancestor::*[contains(concat(' ', @class, ' '), ' fitem ')]
/ancestor::*[contains(concat(' ', @class, ' '), ' fitem ') and not(self::fieldset)]
XPATH
, 'autocomplete_selection' => <<<XPATH
.//div[contains(concat(' ', normalize-space(@class), ' '), concat(' ', 'form-autocomplete-selection', ' '))]/span[@role='option'][contains(normalize-space(.), %locator%)]
public/lib/formslib.php
+3 -2
View File
@@ -3197,7 +3197,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
var $_openHiddenFieldsetTemplate = "\n\t<fieldset class=\"hidden\"><div>";
/** @var string Template used when opening a fieldset */
var $_openFieldsetTemplate = "\n\t<fieldset class=\"{classes}\" {id}>";
var $_openFieldsetTemplate = "\n\t<fieldset class=\"{classes}\" {id} {name}>";
/** @var string Template used when closing a fieldset */
var $_closeFieldsetTemplate = "\n\t\t</div></fieldset>";
@@ -3581,7 +3581,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
// Define collapsible classes for fieldsets.
$arialive = '';
$fieldsetclasses = array('clearfix');
$fieldsetclasses = ['clearfix', 'fitem'];
if (isset($this->_collapsibleElements[$header->getName()])) {
$fieldsetclasses[] = 'collapsible';
if ($this->_collapsibleElements[$header->getName()]) {
@@ -3599,6 +3599,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
}
$openFieldsetTemplate = str_replace('{id}', $id, $this->_openFieldsetTemplate);
$openFieldsetTemplate = str_replace('{name}', ' name="' . $name . '"', $openFieldsetTemplate);
$openFieldsetTemplate = str_replace('{classes}', join(' ', $fieldsetclasses), $openFieldsetTemplate);
$this->_html .= $openFieldsetTemplate . $headerhtml;