L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-58058-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE

Browse Source
This commit is contained in:
Damyon Wiese
2017-12-12 12:15:05 +08:00
parent 9f35372c0c 3eba4443a1
commit 6a02fd458f
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
competency/classes/api.php
+1 -1
View File
@@ -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();
competency/classes/competency.php
+1 -1
View File
@@ -76,7 +76,7 @@ class competency extends persistent {
'default' => FORMAT_HTML
),
'sortorder' => array(
'default' => null,
'default' => 0,
'type' => PARAM_INT
),
'parentid' => array(
competency/classes/template_competency.php
+1 -1
View File
@@ -53,7 +53,7 @@ class template_competency extends persistent {
),
'sortorder' => array(
'type' => PARAM_INT,
'default' => null,
'default' => 0,
),
);
}
competency/classes/user_competency_plan.php
+1 -1
View File
@@ -66,7 +66,7 @@ class user_competency_plan extends persistent {
),
'sortorder' => array(
'type' => PARAM_INT,
'default' => null,
'default' => 0,
),
);
}
competency/tests/external_test.php
+2 -4
View File
@@ -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);