From f250cdbb3488482266740a028006179805613aca Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@fmcorz.net>
Date: Thu, 23 Feb 2017 12:10:14 +0800
Subject: [PATCH 1/2] 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);

From f9bb74c03791f1dcb9aa05aee28f97aef735c79f Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Fri, 1 Dec 2017 13:04:42 +0800
Subject: [PATCH 2/2] MDL-58058 competency: replace other sortorder usages

---
 competency/classes/api.php                  | 2 +-
 competency/classes/template_competency.php  | 2 +-
 competency/classes/user_competency_plan.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/competency/classes/api.php b/competency/classes/api.php
index fc16c0c1f6e..9d04083bf49 100644
--- a/competency/classes/api.php
+++ b/competency/classes/api.php
@@ -165,7 +165,7 @@ class api {
         require_capability('moodle/competency:competencymanage', $competency->get_context());
 
         // Reset the sortorder, use reorder instead.
-        $competency->set('sortorder', null);
+        $competency->set('sortorder', 0);
         $competency->create();
 
         \core\event\competency_created::create_from_competency($competency)->trigger();
diff --git a/competency/classes/template_competency.php b/competency/classes/template_competency.php
index 3e0c8f8b40e..8c6df0b2730 100644
--- a/competency/classes/template_competency.php
+++ b/competency/classes/template_competency.php
@@ -53,7 +53,7 @@ class template_competency extends persistent {
             ),
             'sortorder' => array(
                 'type' => PARAM_INT,
-                'default' => null,
+                'default' => 0,
             ),
         );
     }
diff --git a/competency/classes/user_competency_plan.php b/competency/classes/user_competency_plan.php
index 3880a2aa2df..5b53589cd41 100644
--- a/competency/classes/user_competency_plan.php
+++ b/competency/classes/user_competency_plan.php
@@ -66,7 +66,7 @@ class user_competency_plan extends persistent {
             ),
             'sortorder' => array(
                 'type' => PARAM_INT,
-                'default' => null,
+                'default' => 0,
             ),
         );
     }