Skip to content

Commit

Permalink
Merge branch 'MDL-54104-master' of git://github.com/jleyva/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
danpoltawski committed Jun 30, 2016
2 parents ab8ef75 + 9df9f1f commit 41c18b9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
2 changes: 2 additions & 0 deletions course/externallib.php
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ public static function get_course_contents($courseid, $options = array()) {
list($sectionvalues['summary'], $sectionvalues['summaryformat']) =
external_format_text($section->summary, $section->summaryformat,
$context->id, 'course', 'section', $section->id);
$sectionvalues['section'] = $section->section;
$sectioncontents = array();

//for each module of the section
Expand Down Expand Up @@ -325,6 +326,7 @@ public static function get_course_contents_returns() {
'visible' => new external_value(PARAM_INT, 'is the section visible', VALUE_OPTIONAL),
'summary' => new external_value(PARAM_RAW, 'Section description'),
'summaryformat' => new external_format_value('summary'),
'section' => new external_value(PARAM_INT, 'Section number inside the course', VALUE_OPTIONAL),
'modules' => new external_multiple_structure(
new external_single_structure(
array(
Expand Down
2 changes: 2 additions & 0 deletions course/tests/externallib_test.php
Original file line number Diff line number Diff line change
Expand Up @@ -749,10 +749,12 @@ public function test_get_course_contents() {
}
}
$this->assertEquals(2, $testexecuted);
$this->assertEquals(0, $firstsection['section']);

// Check that the only return section has the 5 created modules.
$this->assertCount(4, $firstsection['modules']);
$this->assertCount(1, $lastsection['modules']);
$this->assertEquals(2, $lastsection['section']);

try {
$sections = core_course_external::get_course_contents($course->id,
Expand Down
7 changes: 7 additions & 0 deletions course/upgrade.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
This files describes API changes in /course/*,
information provided here is intended especially for developers.

=== 3.2 ===

* External function core_course_external::get_course_contents now returns the section's number in the course (new section field).

0 comments on commit 41c18b9

Please sign in to comment.