mirror of
https://github.com/moodle/moodle.git
synced 2025-04-16 05:54:19 +02:00
Merge branch 'w27_MDL-25954_m22_cohortnav' of git://github.com/skodak/moodle
This commit is contained in:
commit
9c52c8a4b0
@ -52,10 +52,15 @@ if (optional_param('cancel', false, PARAM_BOOL)) {
|
||||
|
||||
if ($context->contextlevel == CONTEXT_COURSECAT) {
|
||||
$category = $DB->get_record('course_categories', array('id'=>$context->instanceid), '*', MUST_EXIST);
|
||||
$PAGE->navbar->add($category->name, new moodle_url('/course/index.php', array('categoryedit'=>'1')));
|
||||
navigation_node::override_active_url(new moodle_url('/cohort/index.php', array('contextid'=>$cohort->contextid)));
|
||||
$PAGE->set_pagelayout('report');
|
||||
|
||||
} else {
|
||||
navigation_node::override_active_url(new moodle_url('/cohort/index.php', array()));
|
||||
$PAGE->set_pagelayout('admin');
|
||||
}
|
||||
$PAGE->navbar->add(get_string('cohorts', 'cohort'), new moodle_url('/cohort/', array('contextid'=>$context->id)));
|
||||
$PAGE->navbar->add(get_string('assign', 'cohort'));
|
||||
|
||||
$PAGE->set_title(get_string('cohort:assign', 'cohort'));
|
||||
$PAGE->set_heading($COURSE->fullname);
|
||||
|
||||
|
@ -68,9 +68,13 @@ $PAGE->set_context($context);
|
||||
|
||||
if ($context->contextlevel == CONTEXT_COURSECAT) {
|
||||
$category = $DB->get_record('course_categories', array('id'=>$context->instanceid), '*', MUST_EXIST);
|
||||
$PAGE->navbar->add($category->name, new moodle_url('/course/index.php', array('categoryedit'=>'1')));
|
||||
navigation_node::override_active_url(new moodle_url('/cohort/index.php', array('contextid'=>$cohort->contextid)));
|
||||
$PAGE->set_pagelayout('report');
|
||||
|
||||
} else {
|
||||
navigation_node::override_active_url(new moodle_url('/cohort/index.php', array()));
|
||||
$PAGE->set_pagelayout('admin');
|
||||
}
|
||||
$PAGE->navbar->add(get_string('cohorts', 'cohort'), new moodle_url('/cohort/', array('contextid'=>$context->id)));
|
||||
|
||||
if ($delete and $cohort->id) {
|
||||
$PAGE->url->param('delete', 1);
|
||||
|
@ -59,8 +59,6 @@ if ($category) {
|
||||
$PAGE->set_url('/cohort/index.php', array('contextid'=>$context->id));
|
||||
$PAGE->set_title($strcohorts);
|
||||
$PAGE->set_heading($COURSE->fullname);
|
||||
$PAGE->navbar->add($category->name, new moodle_url('/course/index.php', array('categoryedit'=>'1')));
|
||||
$PAGE->navbar->add($strcohorts);
|
||||
} else {
|
||||
admin_externalpage_setup('cohorts', '', null, '', array('pagelayout'=>'report'));
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user