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

Merge branch 'MDL-63958-master' of git://github.com/jleyva/moodle

Browse Source
This commit is contained in:
Sara Arjona 2019-01-21 15:17:53 +01:00
commit 98c16decde
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
course/tests/externallib_test.php
View File

@ -1225,6 +1225,27 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
$this->assertArrayNotHasKey('completiondata', $result[0]['modules'][0]);
}
/**
* Test mimetype is returned for resources with showtype set.
*/
public function test_get_course_contents_including_mimetype() {
$this->resetAfterTest(true);
$this->setAdminUser();
$course = self::getDataGenerator()->create_course();
$record = new stdClass();
$record->course = $course->id;
$record->showtype = 1;
$resource = self::getDataGenerator()->create_module('resource', $record);
$result = core_course_external::get_course_contents($course->id);
$result = external_api::clean_returnvalue(core_course_external::get_course_contents_returns(), $result);
$this->assertCount(1, $result[0]['modules']); // One module, first section.
$customdata = unserialize(json_decode($result[0]['modules'][0]['customdata']));
$this->assertEquals('text/plain', $customdata['filedetails']['mimetype']);
}
/**
* Test duplicate_course
*/

1
mod/resource/locallib.php
View File

@ -304,6 +304,7 @@ function resource_get_file_details($resource, $cm) {
if (!empty($options['showtype'])) {
if ($mainfile) {
$filedetails['type'] = get_mimetype_description($mainfile);
$filedetails['mimetype'] = $mainfile->get_mimetype();
// Only show type if it is not unknown.
if ($filedetails['type'] === get_mimetype_description('document/unknown')) {
$filedetails['type'] = '';