mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-22 19:06:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-80192-403' of https://github.com/paulholden/moodle into MOODLE_403_STABLE

Browse Source
This commit is contained in:
Jun Pataleta 2024-01-12 17:28:27 +08:00
commit b0c3178932
No known key found for this signature in database
GPG Key ID: F83510526D99E2C7
10 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/en/form.php
View File

@ -50,6 +50,7 @@ $string['filetypesnotall'] = 'It is not allowed to select \'All file types\' her
$string['filetypesnotallowed'] = 'These file types are not allowed here: {$a}';
$string['filetypesothers'] = 'Other files';
$string['filetypesunknown'] = 'Unknown file types: {$a}';
$string['formactions'] = 'Form actions';
$string['general'] = 'General';
$string['hideadvanced'] = 'Hide advanced';
$string['hour'] = 'Hour';

12
lib/form/group.php
View File

@ -46,6 +46,9 @@ class MoodleQuickForm_group extends HTML_QuickForm_group implements templatable
/** @var string html for help button, if empty then no help */
var $_helpbutton='';
/** @var bool if true label will be hidden. */
protected $_hiddenLabel = false;
/** @var MoodleQuickForm */
protected $_mform = null;
@ -113,6 +116,15 @@ class MoodleQuickForm_group extends HTML_QuickForm_group implements templatable
}
}
/**
* Sets label to be hidden
*
* @param bool $hiddenLabel sets if label should be hidden
*/
public function setHiddenLabel($hiddenLabel) {
$this->_hiddenLabel = $hiddenLabel;
}
/**
* Sets the grouped elements and hides label
*

4
lib/form/upgrade.txt
View File

@ -1,6 +1,10 @@
This files describes API changes in core_form libraries and APIs,
information provided here is intended especially for developers.
=== 4.3.3 ===
* New method `setHiddenLabel` added to the group form element type
=== 4.3.1 ===
* The group element has a new method `getAttributesForFormElement` which should be used in conjunction

5
reportbuilder/classes/form/condition.php
View File

@ -146,9 +146,10 @@ class condition extends dynamic_form {
$buttons = [];
$buttons[] = $mform->createElement('submit', 'submitbutton', get_string('apply', 'core_reportbuilder'));
$buttons[] = $mform->createElement('submit', 'resetconditions', get_string('resetall', 'core_reportbuilder'),
null, null, ['customclassoverride' => 'btn-link']);
null, null, ['customclassoverride' => 'btn-link ml-1']);
$mform->addGroup($buttons, 'buttonar', '', [' '], false);
$mform->addGroup($buttons, 'buttonar', get_string('formactions', 'core_form'), '', false)
->setHiddenLabel(true);
$mform->closeHeaderBefore('buttonar');
$mform->disable_form_change_checker();

5
reportbuilder/classes/form/filter.php
View File

@ -149,9 +149,10 @@ class filter extends dynamic_form {
$buttons = [];
$buttons[] = $mform->createElement('submit', 'submitbutton', get_string('apply', 'core_reportbuilder'));
$buttons[] = $mform->createElement('submit', 'resetfilters', get_string('resetall', 'core_reportbuilder'),
null, null, ['customclassoverride' => 'btn-link']);
null, null, ['customclassoverride' => 'btn-link ml-1']);
$mform->addGroup($buttons, 'buttonar', '', [' '], false);
$mform->addGroup($buttons, 'buttonar', get_string('formactions', 'core_form'), '', false)
->setHiddenLabel(true);
$mform->closeHeaderBefore('buttonar');
$mform->disable_form_change_checker();

3
reportbuilder/classes/local/filters/date.php
View File

@ -143,7 +143,8 @@ class date extends base {
$mform->hideIf("{$this->name}_unit", "{$this->name}_operator", 'in', $typesnounit);
// Add operator/value/unit group.
$mform->addGroup($elements, "{$this->name}_group", '', '', false);
$mform->addGroup($elements, "{$this->name}_group", $this->get_header(), '', false)
->setHiddenLabel(true);
// Date selectors for range operator.
$mform->addElement('date_selector', "{$this->name}_from", get_string('filterdatefrom', 'core_reportbuilder'),

3
reportbuilder/classes/local/filters/duration.php
View File

@ -96,7 +96,8 @@ class duration extends base {
$mform->setDefault("{$this->name}_unit", 1);
$mform->hideIf("{$this->name}_unit", "{$this->name}_operator", 'eq', self::DURATION_ANY);
$mform->addGroup($elements, "{$this->name}_group", '', '', false);
$mform->addGroup($elements, "{$this->name}_group", $this->get_header(), '', false)
->setHiddenLabel(true);
}
/**

10
reportbuilder/classes/local/filters/number.php
View File

@ -93,16 +93,16 @@ class number extends base {
get_string('filterfieldvalue', 'core_reportbuilder', $this->get_header()), ['size' => 3]);
$mform->setType($this->name . '_value1', PARAM_INT);
$mform->setDefault($this->name . '_value1', 0);
$mform->hideIf($this->name . '_value1', $this->name . '_operator', 'in',
[self::ANY_VALUE, self::IS_NOT_EMPTY, self::IS_EMPTY]);
$objs['text2'] = $mform->createElement('text', $this->name . '_value2', get_string('to'), ['size' => 3]);
$mform->setType($this->name . '_value2', PARAM_INT);
$mform->setDefault($this->name . '_value2', 0);
$mform->addElement('group', $this->name . '_grp', '', $objs, '', false);
$mform->hideIf($this->name . '_value1', $this->name . '_operator', 'in',
[self::ANY_VALUE, self::IS_NOT_EMPTY, self::IS_EMPTY]);
$mform->hideIf($this->name . '_value2', $this->name . '_operator', 'noteq', self::RANGE);
$mform->addGroup($objs, $this->name . '_grp', $this->get_header(), '', false)
->setHiddenLabel(true);
}
/**

3
reportbuilder/classes/local/filters/select.php
View File

@ -84,7 +84,8 @@ class select extends base {
$elements['value'] = $mform->createElement($element, $this->name . '_value',
get_string('filterfieldvalue', 'core_reportbuilder', $this->get_header()), $options);
$mform->addElement('group', $this->name . '_group', '', $elements, '', false);
$mform->addGroup($elements, $this->name . '_group', $this->get_header(), '', false)
->setHiddenLabel(true);
$mform->hideIf($this->name . '_value', $this->name . '_operator', 'eq', self::ANY_VALUE);
}

3
reportbuilder/classes/local/filters/text.php
View File

@ -92,7 +92,8 @@ class text extends base {
$elements['value'] = $mform->createElement('text', $this->name . '_value',
get_string('filterfieldvalue', 'core_reportbuilder', $this->get_header()));
$mform->addElement('group', $this->name . '_group', '', $elements, '', false);
$mform->addGroup($elements, $this->name . '_group', $this->get_header(), '', false)
->setHiddenLabel(true);
$mform->setType($this->name . '_value', PARAM_RAW);
$mform->hideIf($this->name . '_value', $this->name . '_operator', 'eq', self::ANY_VALUE);