Merge branch 'w31_MDL-28468_m21_cohortassign' of git://github.com/skodak/moodle into MOODLE_21_STABLE
This commit is contained in:
+10
-10
@@ -47,6 +47,7 @@ if ($context->contextlevel == CONTEXT_COURSECAT) {
|
||||
}
|
||||
|
||||
$manager = has_capability('moodle/cohort:manage', $context);
|
||||
$canassign = has_capability('moodle/cohort:assign', $context);
|
||||
if (!$manager) {
|
||||
require_capability('moodle/cohort:view', $context);
|
||||
}
|
||||
@@ -86,18 +87,17 @@ foreach($cohorts as $cohort) {
|
||||
$line[] = get_string('pluginname', $cohort->component);
|
||||
}
|
||||
|
||||
if ($manager) {
|
||||
if (empty($cohort->component)) {
|
||||
$buttons = html_writer::link(new moodle_url('/cohort/edit.php', array('id'=>$cohort->id)), get_string('edit'));
|
||||
$buttons .= ' '.html_writer::link(new moodle_url('/cohort/edit.php', array('id'=>$cohort->id, 'delete'=>1)), get_string('delete'));
|
||||
$buttons .= ' '.html_writer::link(new moodle_url('/cohort/assign.php', array('id'=>$cohort->id)), get_string('assign', 'cohort'));
|
||||
} else {
|
||||
$buttons = '';
|
||||
$buttons = array();
|
||||
if (empty($cohort->component)) {
|
||||
if ($manager) {
|
||||
$buttons[] = html_writer::link(new moodle_url('/cohort/edit.php', array('id'=>$cohort->id, 'delete'=>1)), html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('t/delete'), 'alt'=>get_string('delete'), 'class'=>'iconsmall')));
|
||||
$buttons[] = html_writer::link(new moodle_url('/cohort/edit.php', array('id'=>$cohort->id)), html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('t/edit'), 'alt'=>get_string('edit'), 'class'=>'iconsmall')));
|
||||
}
|
||||
if ($manager or $canassign) {
|
||||
$buttons[] = html_writer::link(new moodle_url('/cohort/assign.php', array('id'=>$cohort->id)), html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('i/users'), 'alt'=>get_string('assign', 'core_cohort'), 'class'=>'iconsmall')));
|
||||
}
|
||||
} else {
|
||||
$buttons = '';
|
||||
}
|
||||
$line[] = $buttons;
|
||||
$line[] = implode(' ', $buttons);
|
||||
|
||||
$data[] = $line;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user