Skip to content
Browse files

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

  • Loading branch information...
1 parent 8df87c1 commit 51173470b6022be1483fd3255c51f3d266bbbada @marinaglancy marinaglancy committed May 31, 2013
Showing with 14 additions and 5 deletions.
  1. +8 −2 grade/grading/form/guide/lib.php
  2. +6 −3 grade/grading/form/rubric/lib.php
View
10 grade/grading/form/guide/lib.php
@@ -501,10 +501,16 @@ public function render_preview(moodle_page $page) {
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
9 grade/grading/form/rubric/lib.php
@@ -505,23 +505,26 @@ public function render_preview(moodle_page $page) {
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');
}

0 comments on commit 5117347

Please sign in to comment.
Something went wrong with that request. Please try again.