From 1179f07d3c676ac199bba3c89bf06ac67031dd43 Mon Sep 17 00:00:00 2001 From: Simey Lameze Date: Fri, 22 May 2020 10:08:16 +0800 Subject: [PATCH] MDL-68793 core_table: fix WS name to comply with guidelines --- lib/db/services.php | 6 +++--- .../amd/build/local/dynamic/repository.min.js | Bin 856 -> 868 bytes .../build/local/dynamic/repository.min.js.map | Bin 3891 -> 3903 bytes lib/table/amd/src/local/dynamic/repository.js | 2 +- .../external/dynamic/{fetch.php => get.php} | 5 ++--- .../dynamic/{fetch_test.php => get_test.php} | 20 +++++++++--------- version.php | 2 +- 7 files changed, 17 insertions(+), 18 deletions(-) rename lib/table/classes/external/dynamic/{fetch.php => get.php} (99%) rename lib/table/tests/external/dynamic/{fetch_test.php => get_test.php} (94%) diff --git a/lib/db/services.php b/lib/db/services.php index e8c1350e4b1..1a9ae7fa9e1 100644 --- a/lib/db/services.php +++ b/lib/db/services.php @@ -2764,10 +2764,10 @@ $functions = array( 'capabilities' => '', 'services' => [MOODLE_OFFICIAL_MOBILE_SERVICE], ], - 'core_table_dynamic_fetch' => [ - 'classname' => 'core_table\external\dynamic\fetch', + 'core_table_get_dynamic_table_content' => [ + 'classname' => 'core_table\external\dynamic\get', 'methodname' => 'execute', - 'description' => 'Fetch a dynamic table view raw html', + 'description' => 'Get the dynamic table content raw html', 'type' => 'read', 'ajax' => true, 'services' => [MOODLE_OFFICIAL_MOBILE_SERVICE], diff --git a/lib/table/amd/build/local/dynamic/repository.min.js b/lib/table/amd/build/local/dynamic/repository.min.js index ff5ca2626c11d20f770721a979713af9245fc165..e07cb965fd3a1acbd4cebab274598caec1060f26 100644 GIT binary patch delta 37 scmcb?_JnOi36o@cYDs)bWnN-#W^#NMqIsgCw delta 25 gcmaFDc7tt02@`KhWnN-#W^#O5YDsd&}%N83Awy B5S{=4 delta 34 pcmdllw^?ojFEf*o(`J6=5H8-7%Dlwf%;fmA)RN?k%{9D-83DVV3u6EP diff --git a/lib/table/amd/src/local/dynamic/repository.js b/lib/table/amd/src/local/dynamic/repository.js index 3e43ac94965..e548e975c47 100644 --- a/lib/table/amd/src/local/dynamic/repository.js +++ b/lib/table/amd/src/local/dynamic/repository.js @@ -54,7 +54,7 @@ export const fetch = (component, handler, uniqueid, { hiddenColumns = {} } = {}, resetPreferences = false) => { return fetchMany([{ - methodname: `core_table_dynamic_fetch`, + methodname: `core_table_get_dynamic_table_content`, args: { component, handler, diff --git a/lib/table/classes/external/dynamic/fetch.php b/lib/table/classes/external/dynamic/get.php similarity index 99% rename from lib/table/classes/external/dynamic/fetch.php rename to lib/table/classes/external/dynamic/get.php index ad2fcda01fe..f21e463a3d7 100644 --- a/lib/table/classes/external/dynamic/fetch.php +++ b/lib/table/classes/external/dynamic/get.php @@ -31,7 +31,6 @@ use external_multiple_structure; use external_single_structure; use external_value; use external_warnings; -use moodle_url; /** * Core table external functions. @@ -41,7 +40,7 @@ use moodle_url; * @copyright 2020 Simey Lameze * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class fetch extends external_api { +class get extends external_api { /** * Describes the parameters for fetching the table html. @@ -140,7 +139,7 @@ class fetch extends external_api { } /** - * External function to fetch a table view. + * External function to get the table view content. * * @param string $component The component. * @param string $handler Dynamic table class name. diff --git a/lib/table/tests/external/dynamic/fetch_test.php b/lib/table/tests/external/dynamic/get_test.php similarity index 94% rename from lib/table/tests/external/dynamic/fetch_test.php rename to lib/table/tests/external/dynamic/get_test.php index c8250790e8c..be186e51e14 100644 --- a/lib/table/tests/external/dynamic/fetch_test.php +++ b/lib/table/tests/external/dynamic/get_test.php @@ -15,7 +15,7 @@ // along with Moodle. If not, see . /** - * Unit tests for core_table\external\fetch; + * Unit tests for core_table\external\dynamic\get; * * @package core_table * @category test @@ -31,14 +31,14 @@ use core_table\local\filter\filter; use advanced_testcase; /** - * Unit tests for core_table\external\fetch; + * Unit tests for core_table\external\dynamic\get; * * @package core_table * @category test * @copyright 2020 Simey Lameze * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class fetch_test extends advanced_testcase { +class get_test extends advanced_testcase { /** * Setup before class. @@ -55,7 +55,7 @@ class fetch_test extends advanced_testcase { $this->resetAfterTest(); $this->expectException(\invalid_parameter_exception::class); - fetch::execute( + get::execute( "core-user", "participants", "", @@ -79,7 +79,7 @@ class fetch_test extends advanced_testcase { $this->resetAfterTest(); $this->expectException(\UnexpectedValueException::class); - fetch::execute( + get::execute( "core_users", "participants", "", @@ -106,7 +106,7 @@ class fetch_test extends advanced_testcase { $this->expectExceptionMessage("Table handler class {$handler} not found. Please make sure that your table handler class is under the \\core_user\\table namespace."); // Tests that invalid users_participants_table class gets an exception. - fetch::execute( + get::execute( "core_user", "users_participants_table", "", @@ -143,7 +143,7 @@ class fetch_test extends advanced_testcase { $this->expectExceptionMessage("Invalid parameter value detected (filters => Invalid parameter value detected " . "(Missing required key in single structure: name): Missing required key in single structure: name"); - fetch::execute( + get::execute( "core_user", "participants", "user-index-participants-{$course->id}", $this->get_sort_array(['firstname' => SORT_ASC]), @@ -153,9 +153,9 @@ class fetch_test extends advanced_testcase { } /** - * Test execute fetch table. + * Test execute method. */ - public function test_execute_fetch_table(): void { + public function test_table_get_execute(): void { $this->resetAfterTest(); $course = $this->getDataGenerator()->create_course(); @@ -176,7 +176,7 @@ class fetch_test extends advanced_testcase { ] ]; - $participantstable = fetch::execute( + $participantstable = get::execute( "core_user", "participants", "user-index-participants-{$course->id}", diff --git a/version.php b/version.php index 32f956cffac..17fac9b5ecb 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2020052900.00; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2020052900.01; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes. $release = '3.9dev+ (Build: 20200529)'; // Human-friendly version name -- 2.17.1