Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
prechecker
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
integration
prechecker
Commits
59be445c
Commit
59be445c
authored
Dec 12, 2017
by
Damyon Wiese
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'MDL-58058-master' of
git://github.com/lameze/moodle
parents
302104af
f9bb74c0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
8 deletions
+6
-8
competency/classes/api.php
competency/classes/api.php
+1
-1
competency/classes/competency.php
competency/classes/competency.php
+1
-1
competency/classes/template_competency.php
competency/classes/template_competency.php
+1
-1
competency/classes/user_competency_plan.php
competency/classes/user_competency_plan.php
+1
-1
competency/tests/external_test.php
competency/tests/external_test.php
+2
-4
No files found.
competency/classes/api.php
View file @
59be445c
...
...
@@ -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
View file @
59be445c
...
...
@@ -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
View file @
59be445c
...
...
@@ -53,7 +53,7 @@ class template_competency extends persistent {
),
'sortorder'
=>
array
(
'type'
=>
PARAM_INT
,
'default'
=>
null
,
'default'
=>
0
,
),
);
}
...
...
competency/classes/user_competency_plan.php
View file @
59be445c
...
...
@@ -66,7 +66,7 @@ class user_competency_plan extends persistent {
),
'sortorder'
=>
array
(
'type'
=>
PARAM_INT
,
'default'
=>
null
,
'default'
=>
0
,
),
);
}
...
...
competency/tests/external_test.php
View file @
59be445c
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment