MDL-39710 Don't display rubric and guide preview unless option checked

This commit is contained in:
Marina Glancy 2013-05-31 16:09:21 +10:00
parent 8f485ce28e
commit 027c230796
2 changed files with 14 additions and 5 deletions

View File

@ -501,10 +501,16 @@ class gradingform_guide_controller extends gradingform_controller {
throw new coding_exception('It is the caller\'s responsibility to make sure that the form is actually defined');
}
$output = $this->get_renderer($page);
// Check if current user is able to see preview
$options = $this->get_options();
if (empty($options['alwaysshowdefinition']) && !has_capability('moodle/grade:managegradingforms', $page->context)) {
return '';
}
$criteria = $this->definition->guide_criteria;
$comments = $this->definition->guide_comment;
$options = $this->get_options();
$output = $this->get_renderer($page);
$guide = '';
$guide .= $output->box($this->get_formatted_description(), 'gradingform_guide-description');
if (has_capability('moodle/grade:managegradingforms', $page->context)) {

View File

@ -505,23 +505,26 @@ class gradingform_rubric_controller extends gradingform_controller {
throw new coding_exception('It is the caller\'s responsibility to make sure that the form is actually defined');
}
$output = $this->get_renderer($page);
$criteria = $this->definition->rubric_criteria;
$options = $this->get_options();
$rubric = '';
if (has_capability('moodle/grade:managegradingforms', $page->context)) {
$showdescription = true;
} else {
if (empty($options['alwaysshowdefinition'])) {
// ensure we don't display unless show rubric option enabled
return '';
}
$showdescription = $options['showdescriptionstudent'];
}
$output = $this->get_renderer($page);
if ($showdescription) {
$rubric .= $output->box($this->get_formatted_description(), 'gradingform_rubric-description');
}
if (has_capability('moodle/grade:managegradingforms', $page->context)) {
$rubric .= $output->display_rubric_mapping_explained($this->get_min_max_score());
$rubric .= $output->display_rubric($criteria, $options, self::DISPLAY_PREVIEW, 'rubric');
// ensure we don't display unless show rubric option enabled
} else if ( !empty($options['alwaysshowdefinition']) ) {
} else {
$rubric .= $output->display_rubric($criteria, $options, self::DISPLAY_PREVIEW_GRADED, 'rubric');
}