mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity

MDL-69752 mod_data: Format module intro on Database activities page

Browse Source
This commit is contained in:
Mikhail Golenkov 2020-10-04 13:44:17 +11:00
parent 87afa4d759
commit 0f7c2b92f6
2 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mod/data/index.php
View File

@ -87,9 +87,6 @@ if ($rss) {
array_push($table->align, 'center');
}
$options = new stdClass();
$options->noclean = true;
$currentsection = "";
foreach ($datas as $data) {
@ -130,10 +127,12 @@ foreach ($datas as $data) {
}
$currentsection = $data->section;
}
$row = array ($printsection, $link, format_text($data->intro, $data->introformat, $options), $numrecords, $numunapprovedrecords);
$row = array($printsection, $link, format_module_intro('data', $data, $data->coursemodule),
$numrecords, $numunapprovedrecords);
} else {
$row = array ($link, format_text($data->intro, $data->introformat, $options), $numrecords, $numunapprovedrecords);
$row = array($link, format_module_intro('data', $data, $data->coursemodule),
$numrecords, $numunapprovedrecords);
}
if ($rss) {

47
mod/data/tests/behat/data_activities.feature Normal file
View File

@ -0,0 +1,47 @@
@mod @mod_data
Feature: Users can view the list of data activities and their formatted descriptions
Background:
Given the following "users" exist:
| username | firstname | lastname | email |
| student1 | Bob | 1 | student1@example.com |
| teacher1 | Teacher | 1 | teacher1@example.com |
And the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
And the following "activities" exist:
| activity | name | intro | course | idnumber |
| data | Test database 1 | This is an intro without an image | C1 | data1 |
| data | Test database 2 | This is an intro with an image: <img src="@@PLUGINFILE@@/some_image.jpg"> | C1 | data2 |
And I log in as "admin"
And I am on "Course 1" course homepage with editing mode on
And I add the "Activities" block
And I log out
Scenario: Teachers can view the list of data activities and their formatted descriptions
Given I log in as "teacher1"
And I am on "Course 1" course homepage
When I follow "Databases"
Then I should see "Test database 1"
And I should see "Test database 2"
And I should see "This is an intro without an image"
And I should see "This is an intro with an image: "
And "//img[contains(@src, 'some_image.jpg')]" "xpath_element" should exist
And "//img[contains(@src, '@@PLUGINFILE@@/some_image.jpg')]" "xpath_element" should not exist
And I log out
Scenario: Students can view the list of data activities and their formatted descriptions
Given I log in as "student1"
And I am on "Course 1" course homepage
When I follow "Databases"
Then I should see "Test database 1"
And I should see "Test database 2"
And I should see "This is an intro without an image"
And I should see "This is an intro with an image: "
And "//img[contains(@src, 'some_image.jpg')]" "xpath_element" should exist
And "//img[contains(@src, '@@PLUGINFILE@@/some_image.jpg')]" "xpath_element" should not exist
And I log out