mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-53799-31' of https://github.com/vadimonus/moodle

Browse Source
This commit is contained in:
David Monllao 2016-04-20 10:59:49 +08:00
commit 45073995a1
2 changed files with 7 additions and 7 deletions

4
lib/navigationlib.php

@ -3919,7 +3919,7 @@ class settings_navigation extends navigation_node {
// Reset this course
if (has_capability('moodle/course:reset', $coursecontext)) {
$url = new moodle_url('/course/reset.php', array('id'=>$course->id));
$coursenode->add(get_string('reset'), $url, self::TYPE_SETTING, null, null, new pix_icon('i/return', ''));
$coursenode->add(get_string('reset'), $url, self::TYPE_SETTING, null, 'reset', new pix_icon('i/return', ''));
}
// Questions
@ -3969,7 +3969,7 @@ class settings_navigation extends navigation_node {
}
}
if (is_array($roles) && count($roles)>0) {
$switchroles = $this->add(get_string('switchroleto'));
$switchroles = $this->add(get_string('switchroleto'), null, self::TYPE_CONTAINER, null, 'switchroleto');
if ((count($roles)==1 && array_key_exists(0, $roles))|| $assumedrole!==false) {
$switchroles->force_open();
}

10
lib/questionlib.php

@ -1388,24 +1388,24 @@ function question_extend_settings_navigation(navigation_node $navigationnode, $c
}
$questionnode = $navigationnode->add(get_string('questionbank', 'question'),
new moodle_url('/question/edit.php', $params), navigation_node::TYPE_CONTAINER);
new moodle_url('/question/edit.php', $params), navigation_node::TYPE_CONTAINER, null, 'questionbank');
$contexts = new question_edit_contexts($context);
if ($contexts->have_one_edit_tab_cap('questions')) {
$questionnode->add(get_string('questions', 'question'), new moodle_url(
'/question/edit.php', $params), navigation_node::TYPE_SETTING);
'/question/edit.php', $params), navigation_node::TYPE_SETTING, null, 'questions');
}
if ($contexts->have_one_edit_tab_cap('categories')) {
$questionnode->add(get_string('categories', 'question'), new moodle_url(
'/question/category.php', $params), navigation_node::TYPE_SETTING);
'/question/category.php', $params), navigation_node::TYPE_SETTING, null, 'categories');
}
if ($contexts->have_one_edit_tab_cap('import')) {
$questionnode->add(get_string('import', 'question'), new moodle_url(
'/question/import.php', $params), navigation_node::TYPE_SETTING);
'/question/import.php', $params), navigation_node::TYPE_SETTING, null, 'import');
}
if ($contexts->have_one_edit_tab_cap('export')) {
$questionnode->add(get_string('export', 'question'), new moodle_url(
'/question/export.php', $params), navigation_node::TYPE_SETTING);
'/question/export.php', $params), navigation_node::TYPE_SETTING, null, 'export');
}
return $questionnode;