From 74d4a8e314b789db596f5f3364fbaee7aff3aa67 Mon Sep 17 00:00:00 2001 From: Russell Boyatt Date: Wed, 29 May 2013 15:32:48 +0100 Subject: [PATCH 1/2] Fixing MDL-39710: setting to limit student access to rubric now checked. --- grade/grading/form/rubric/lib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/grade/grading/form/rubric/lib.php b/grade/grading/form/rubric/lib.php index 247724d3daa..22b124ee7f3 100644 --- a/grade/grading/form/rubric/lib.php +++ b/grade/grading/form/rubric/lib.php @@ -519,7 +519,8 @@ class gradingform_rubric_controller extends gradingform_controller { 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'); - } else { + // ensure we don't display unless show rubric option enabled + } else if ( !empty($options['alwaysshowdefinition']) ) { $rubric .= $output->display_rubric($criteria, $options, self::DISPLAY_PREVIEW_GRADED, 'rubric'); } From 8069eac74bde93ee6dd40fa8c59569e4add466ad Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Fri, 31 May 2013 16:09:21 +1000 Subject: [PATCH 2/2] MDL-39710 Don't display rubric and guide preview unless option checked --- grade/grading/form/guide/lib.php | 10 ++++++++-- grade/grading/form/rubric/lib.php | 9 ++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/grade/grading/form/guide/lib.php b/grade/grading/form/guide/lib.php index 15ef0d7b1de..33686a8a62c 100644 --- a/grade/grading/form/guide/lib.php +++ b/grade/grading/form/guide/lib.php @@ -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)) { diff --git a/grade/grading/form/rubric/lib.php b/grade/grading/form/rubric/lib.php index 22b124ee7f3..b323dc9a1df 100644 --- a/grade/grading/form/rubric/lib.php +++ b/grade/grading/form/rubric/lib.php @@ -504,23 +504,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'); }