From 16840c7126f2492cc0b0138f661cd19117119b54 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Tue, 7 Feb 2017 14:07:51 +0100 Subject: [PATCH] MDL-57890 ws: Return cmid in all get_by_courses WebServices --- mod/folder/classes/external.php | 1 + mod/folder/tests/externallib_test.php | 5 +++-- mod/label/classes/external.php | 1 + mod/label/tests/externallib_test.php | 4 ++-- mod/page/classes/external.php | 1 + mod/page/tests/externallib_test.php | 2 +- mod/resource/classes/external.php | 1 + mod/resource/tests/externallib_test.php | 2 +- mod/url/classes/external.php | 1 + mod/url/tests/externallib_test.php | 5 +++-- 10 files changed, 15 insertions(+), 8 deletions(-) diff --git a/mod/folder/classes/external.php b/mod/folder/classes/external.php index 0e4d33f0c92..f875c929b53 100644 --- 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 ad44efb6621..912a3d682b0 100644 --- 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 cd43576dca1..064af2d7e7a 100644 --- 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 c1f5b377907..0b846db3062 100644 --- 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 9ef73369ea4..260512afeae 100644 --- 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 e30506fc35a..c88fd4616a6 100644 --- 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 0c06abcafdb..539aaf5279a 100644 --- 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 c8a2a654de2..99aff26cedc 100644 --- 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 59e28c242ab..aba5d4079ea 100644 --- 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 eea0bf476f9..1ddb9915ac7 100644 --- 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;