From a34f98e166d8e4c00be166f4e4ce3704432081b4 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Thu, 23 Feb 2017 12:10:14 +0800 Subject: [PATCH] MDL-58058 competency: Allow unspecified sortorder for new competencies --- competency/classes/competency.php | 2 +- competency/tests/external_test.php | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/competency/classes/competency.php b/competency/classes/competency.php index c537508419a..9e417e9d014 100644 --- a/competency/classes/competency.php +++ b/competency/classes/competency.php @@ -76,7 +76,7 @@ class competency extends persistent { 'default' => FORMAT_HTML ), 'sortorder' => array( - 'default' => null, + 'default' => 0, 'type' => PARAM_INT ), 'parentid' => array( diff --git a/competency/tests/external_test.php b/competency/tests/external_test.php index f8a09e0edfc..f0b50c8db06 100644 --- a/competency/tests/external_test.php +++ b/competency/tests/external_test.php @@ -281,8 +281,7 @@ class core_competency_external_testcase extends externallib_advanced_testcase { 'idnumber' => 'idnumber' . $number, 'description' => 'description' . $number, 'descriptionformat' => FORMAT_HTML, - 'competencyframeworkid' => $frameworkid, - 'sortorder' => 0 + 'competencyframeworkid' => $frameworkid ); $result = external::create_competency($competency); return (object) external_api::clean_returnvalue(external::create_competency_returns(), $result); @@ -294,8 +293,7 @@ class core_competency_external_testcase extends externallib_advanced_testcase { 'shortname' => 'shortname' . $number, 'idnumber' => 'idnumber' . $number, 'description' => 'description' . $number, - 'descriptionformat' => FORMAT_HTML, - 'sortorder' => 0 + 'descriptionformat' => FORMAT_HTML ); $result = external::update_competency($competency); return external_api::clean_returnvalue(external::update_competency_returns(), $result);