MDL-57890 ws: Return cmid in all get_by_courses WebServices

diff --git a/mod/folder/classes/external.php b/mod/folder/classes/external.php
index 0e4d33f..f875c92 100644 (file)
--- a/mod/folder/classes/external.php
+++ b/mod/folder/classes/external.php
@@ -185,6 +185,7 @@ class mod_folder_external extends external_api {
                     new external_single_structure(
                         array(
                             'id' => new external_value(PARAM_INT, 'Module id'),
+                            'coursemodule' => new external_value(PARAM_INT, 'Course module id'),
                             'course' => new external_value(PARAM_INT, 'Course id'),
                             'name' => new external_value(PARAM_RAW, 'Page name'),
                             'intro' => new external_value(PARAM_RAW, 'Summary'),

diff --git a/mod/folder/tests/externallib_test.php b/mod/folder/tests/externallib_test.php
index ad44efb..912a3d6 100644 (file)
--- a/mod/folder/tests/externallib_test.php
+++ b/mod/folder/tests/externallib_test.php
@@ -152,8 +152,9 @@ class mod_folder_external_testcase extends externallib_advanced_testcase {
         $returndescription = mod_folder_external::get_folders_by_courses_returns();
 
         // Create what we expect to be returned when querying the two courses.
-        $expectedfields = array('id', 'course', 'name', 'intro', 'introformat', 'introfiles', 'revision', 'timemodified',
-                                'display', 'showexpanded', 'showdownloadfolder', 'section', 'visible', 'groupmode', 'groupingid');
+        $expectedfields = array('id', 'coursemodule', 'course', 'name', 'intro', 'introformat', 'introfiles', 'revision',
+                                'timemodified', 'display', 'showexpanded', 'showdownloadfolder', 'section', 'visible',
+                                'groupmode', 'groupingid');
 
         // Add expected coursemodule and data.
         $folder1->coursemodule = $folder1->cmid;

diff --git a/mod/label/classes/external.php b/mod/label/classes/external.php
index cd43576..064af2d 100644 (file)
--- a/mod/label/classes/external.php
+++ b/mod/label/classes/external.php
@@ -120,6 +120,7 @@ class mod_label_external extends external_api {
                     new external_single_structure(
                         array(
                             'id' => new external_value(PARAM_INT, 'Module id'),
+                            'coursemodule' => new external_value(PARAM_INT, 'Course module id'),
                             'course' => new external_value(PARAM_INT, 'Course id'),
                             'name' => new external_value(PARAM_RAW, 'Label name'),
                             'intro' => new external_value(PARAM_RAW, 'Label contents'),

diff --git a/mod/label/tests/externallib_test.php b/mod/label/tests/externallib_test.php
index c1f5b37..0b846db 100644 (file)
--- a/mod/label/tests/externallib_test.php
+++ b/mod/label/tests/externallib_test.php
@@ -82,8 +82,8 @@ class mod_label_external_testcase extends externallib_advanced_testcase {
         $returndescription = mod_label_external::get_labels_by_courses_returns();
 
         // Create what we expect to be returned when querying the two courses.
-        $expectedfields = array('id', 'course', 'name', 'intro', 'introformat', 'introfiles', 'timemodified', 'section',
-                                    'visible', 'groupmode', 'groupingid');
+        $expectedfields = array('id', 'coursemodule', 'course', 'name', 'intro', 'introformat', 'introfiles', 'timemodified',
+                                'section', 'visible', 'groupmode', 'groupingid');
 
         // Add expected coursemodule and data.
         $label1->coursemodule = $label1->cmid;

diff --git a/mod/page/classes/external.php b/mod/page/classes/external.php
index 9ef7336..260512a 100644 (file)
--- a/mod/page/classes/external.php
+++ b/mod/page/classes/external.php
@@ -189,6 +189,7 @@ class mod_page_external extends external_api {
                     new external_single_structure(
                         array(
                             'id' => new external_value(PARAM_INT, 'Module id'),
+                            'coursemodule' => new external_value(PARAM_INT, 'Course module id'),
                             'course' => new external_value(PARAM_INT, 'Course id'),
                             'name' => new external_value(PARAM_RAW, 'Page name'),
                             'intro' => new external_value(PARAM_RAW, 'Summary'),

diff --git a/mod/page/tests/externallib_test.php b/mod/page/tests/externallib_test.php
index e30506f..c88fd46 100644 (file)
--- a/mod/page/tests/externallib_test.php
+++ b/mod/page/tests/externallib_test.php
@@ -152,7 +152,7 @@ class mod_page_external_testcase extends externallib_advanced_testcase {
         $returndescription = mod_page_external::get_pages_by_courses_returns();
 
         // Create what we expect to be returned when querying the two courses.
-        $expectedfields = array('id', 'course', 'name', 'intro', 'introformat', 'introfiles',
+        $expectedfields = array('id', 'coursemodule', 'course', 'name', 'intro', 'introformat', 'introfiles',
                                 'content', 'contentformat', 'contentfiles', 'legacyfiles', 'legacyfileslast', 'display',
                                 'displayoptions', 'revision', 'timemodified', 'section', 'visible', 'groupmode', 'groupingid');
 

diff --git a/mod/resource/classes/external.php b/mod/resource/classes/external.php
index 0c06abc..539aaf5 100644 (file)
--- a/mod/resource/classes/external.php
+++ b/mod/resource/classes/external.php
@@ -186,6 +186,7 @@ class mod_resource_external extends external_api {
                     new external_single_structure(
                         array(
                             'id' => new external_value(PARAM_INT, 'Module id'),
+                            'coursemodule' => new external_value(PARAM_INT, 'Course module id'),
                             'course' => new external_value(PARAM_INT, 'Course id'),
                             'name' => new external_value(PARAM_RAW, 'Page name'),
                             'intro' => new external_value(PARAM_RAW, 'Summary'),

diff --git a/mod/resource/tests/externallib_test.php b/mod/resource/tests/externallib_test.php
index c8a2a65..99aff26 100644 (file)
--- a/mod/resource/tests/externallib_test.php
+++ b/mod/resource/tests/externallib_test.php
@@ -153,7 +153,7 @@ class mod_resource_external_testcase extends externallib_advanced_testcase {
         $returndescription = mod_resource_external::get_resources_by_courses_returns();
 
         // Create what we expect to be returned when querying the two courses.
-        $expectedfields = array('id', 'course', 'name', 'intro', 'introformat', 'introfiles',
+        $expectedfields = array('id', 'coursemodule', 'course', 'name', 'intro', 'introformat', 'introfiles',
                                 'contentfiles', 'tobemigrated', 'legacyfiles', 'legacyfileslast', 'display', 'displayoptions',
                                 'filterfiles', 'revision', 'timemodified', 'section', 'visible', 'groupmode', 'groupingid');
 

diff --git a/mod/url/classes/external.php b/mod/url/classes/external.php
index 59e28c2..aba5d40 100644 (file)
--- a/mod/url/classes/external.php
+++ b/mod/url/classes/external.php
@@ -185,6 +185,7 @@ class mod_url_external extends external_api {
                     new external_single_structure(
                         array(
                             'id' => new external_value(PARAM_INT, 'Module id'),
+                            'coursemodule' => new external_value(PARAM_INT, 'Course module id'),
                             'course' => new external_value(PARAM_INT, 'Course id'),
                             'name' => new external_value(PARAM_RAW, 'URL name'),
                             'intro' => new external_value(PARAM_RAW, 'Summary'),

diff --git a/mod/url/tests/externallib_test.php b/mod/url/tests/externallib_test.php
index eea0bf4..1ddb991 100644 (file)
--- a/mod/url/tests/externallib_test.php
+++ b/mod/url/tests/externallib_test.php
@@ -152,8 +152,9 @@ class mod_url_external_testcase extends externallib_advanced_testcase {
         $returndescription = mod_url_external::get_urls_by_courses_returns();
 
         // Create what we expect to be returned when querying the two courses.
-        $expectedfields = array('id', 'course', 'name', 'intro', 'introformat', 'introfiles', 'externalurl', 'display',
-                                'displayoptions', 'parameters', 'timemodified', 'section', 'visible', 'groupmode', 'groupingid');
+        $expectedfields = array('id', 'coursemodule', 'course', 'name', 'intro', 'introformat', 'introfiles', 'externalurl',
+                                'display', 'displayoptions', 'parameters', 'timemodified', 'section', 'visible', 'groupmode',
+                                'groupingid');
 
         // Add expected coursemodule and data.
         $url1->coursemodule = $url1->cmid;