mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-77685-404' of https://github.com/paulholden/moodle into MOODLE_404_STABLE

Browse Source
This commit is contained in:
Ilya Tregubov 2024-05-31 09:04:44 +08:00
commit 1e480e2851
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
grade/report/singleview/classes/local/screen/user.php
View File

@ -198,14 +198,9 @@ class user extends tablelike implements selectable_items {
$itemicon = html_writer::div($this->format_icon($item), 'mr-1'); $itemicon = html_writer::div($this->format_icon($item), 'mr-1');
$itemtype = \html_writer::span(\grade_helper::get_element_type_string($gradetreeitem), $itemtype = \html_writer::span(\grade_helper::get_element_type_string($gradetreeitem),
'd-block text-uppercase small dimmed_text'); 'd-block text-uppercase small dimmed_text');
// If a behat test site is running avoid outputting the information about the type of the grade item.
// This additional information currently causes issues in behat particularly with the existing xpath used to $itemtitle = html_writer::div($itemname, 'rowtitle');
// interact with table elements. $itemcontent = html_writer::div($itemtype . $itemtitle);
if (!defined('BEHAT_SITE_RUNNING')) {
$itemcontent = html_writer::div($itemtype . $itemname);
} else {
$itemcontent = html_writer::div($itemname);
}
$line = [ $line = [
html_writer::div($itemicon . $itemcontent, "{$type} d-flex align-items-center"), html_writer::div($itemicon . $itemcontent, "{$type} d-flex align-items-center"),

10
grade/report/user/classes/report/user.php
View File

@ -598,14 +598,8 @@ class user extends grade_report {
} }
// Generate the content for a cell that represents a grade item. // Generate the content for a cell that represents a grade item.
// If a behat test site is running avoid outputting the information about the type of the grade item. $itemtitle = \html_writer::div($fullname, 'rowtitle');
// This additional information causes issues in behat particularly with the existing xpath used to $content = \html_writer::div($itemtype . $itemtitle);
// interact with table elements.
if (!defined('BEHAT_SITE_RUNNING')) {
$content = \html_writer::div($itemtype . $fullname);
} else {
$content = \html_writer::div($fullname);
}
// Name. // Name.
$data['itemname']['content'] = \html_writer::div($itemicon . $content, "{$type} d-flex align-items-center"); $data['itemname']['content'] = \html_writer::div($itemicon . $content, "{$type} d-flex align-items-center");