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

Merge branch 'MDL-61521-34' of git://github.com/jleyva/moodle into MOODLE_34_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2018-05-08 01:44:53 +02:00
parent c305233628 ae4963c300
commit 403e3b0333
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/externallib.php
+12 -3
View File
@@ -1710,7 +1710,7 @@ class core_course_external extends external_api {
$categoryinfo = array();
$categoryinfo['id'] = $category->id;
$categoryinfo['name'] = $category->name;
$categoryinfo['name'] = external_format_string($category->name, $context->id);
list($categoryinfo['description'], $categoryinfo['descriptionformat']) =
external_format_text($category->description, $category->descriptionformat,
$context->id, 'coursecat', 'description', null);
@@ -1862,8 +1862,12 @@ class core_course_external extends external_api {
external_validate_format($category['descriptionformat']);
$newcategory = coursecat::create($category);
$context = context_coursecat::instance($newcategory->id);
$createdcategories[] = array('id' => $newcategory->id, 'name' => $newcategory->name);
$createdcategories[] = array(
'id' => $newcategory->id,
'name' => external_format_string($newcategory->name, $context->id),
);
}
$transaction->allow_commit();
@@ -2267,6 +2271,11 @@ class core_course_external extends external_api {
list($summary, $summaryformat) =
external_format_text($course->summary, $course->summaryformat, $coursecontext->id, 'course', 'summary', null);
$categoryname = '';
if (!empty($category)) {
$categoryname = external_format_string($category->name, $category->get_context()->id);
}
$displayname = get_course_display_name_for_list($course);
$coursereturns = array();
$coursereturns['id'] = $course->id;
@@ -2274,7 +2283,7 @@ class core_course_external extends external_api {
$coursereturns['displayname'] = external_format_string($displayname, $coursecontext->id);
$coursereturns['shortname'] = external_format_string($course->shortname, $coursecontext->id);
$coursereturns['categoryid'] = $course->category;
$coursereturns['categoryname'] = $category == null ? '' : $category->name;
$coursereturns['categoryname'] = $categoryname;
$coursereturns['summary'] = $summary;
$coursereturns['summaryformat'] = $summaryformat;
$coursereturns['summaryfiles'] = external_util::get_area_files($coursecontext->id, 'course', 'summary', false, false);
course/tests/externallib_test.php
+2 -1
View File
@@ -2041,7 +2041,7 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
global $DB;
$this->resetAfterTest(true);
$category1 = self::getDataGenerator()->create_category();
$category1 = self::getDataGenerator()->create_category(array('name' => 'Cat 1'));
$category2 = self::getDataGenerator()->create_category(array('parent' => $category1->id));
$course1 = self::getDataGenerator()->create_course(array('category' => $category1->id, 'shortname' => 'c1'));
$course2 = self::getDataGenerator()->create_course(array('visible' => 0, 'category' => $category2->id, 'idnumber' => 'i2'));
@@ -2086,6 +2086,7 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
$result = external_api::clean_returnvalue(core_course_external::get_courses_by_field_returns(), $result);
$this->assertCount(1, $result['courses']);
$this->assertEquals($course1->id, $result['courses'][0]['id']);
$this->assertEquals('Cat 1', $result['courses'][0]['categoryname']);
$result = core_course_external::get_courses_by_field('shortname', 'c1');
$result = external_api::clean_returnvalue(core_course_external::get_courses_by_field_returns(), $result);