mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-17 06:25:33 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-39103-master' of git://github.com/xow/moodle

Browse Source 
Conflicts:
	mod/lesson/lib.php
This commit is contained in:
Dan Poltawski 2015-01-13 12:49:50 +00:00
commit 594276893e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mod/lesson/lib.php
View File

@ -791,8 +791,11 @@ function lesson_extend_settings_navigation($settings, $lessonnode) {
if (has_capability('mod/lesson:edit', $PAGE->cm->context)) {
$url = new moodle_url('/mod/lesson/view.php', array('id' => $PAGE->cm->id));
$lessonnode->add(get_string('preview', 'lesson'), $url);
$url = new moodle_url('/mod/lesson/edit.php', array('id'=>$PAGE->cm->id));
$lessonnode->add(get_string('edit', 'lesson'), $url);
$editnode = $lessonnode->add(get_string('edit', 'lesson'));
$url = new moodle_url('/mod/lesson/edit.php', array('id' => $PAGE->cm->id, 'mode' => 'collapsed'));
$editnode->add(get_string('collapsed', 'lesson'), $url);
$url = new moodle_url('/mod/lesson/edit.php', array('id' => $PAGE->cm->id, 'mode' => 'full'));
$editnode->add(get_string('full', 'lesson'), $url);
}
if (has_capability('mod/lesson:manage', $PAGE->cm->context)) {

4
mod/lesson/report.php
View File

@ -70,9 +70,7 @@ if (!$students->valid()) {
}
$url = new moodle_url('/mod/lesson/report.php', array('id'=>$id));
if ($action !== 'reportoverview') {
$url->param('action', $action);
}
$url->param('action', $action);
if ($pageid !== null) {
$url->param('pageid', $pageid);
}

1
mod/lesson/view.php
View File

@ -353,7 +353,6 @@ if ($pageid != LESSON_EOL) {
}
}
$PAGE->set_url('/mod/lesson/view.php', array('id' => $cm->id, 'pageid' => $page->id));
$PAGE->set_subpage($page->id);
$currenttab = 'view';
$extraeditbuttons = true;