Merge branch 'wip-MDL-34310-master' of git://github.com/marinaglancy/…

…moodle
moodle · Aug 27, 2012 · a72ff02 · a72ff02
2 parents 7b0c1bf + 42b1867
commit a72ff02
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/grade/grading/form/guide/lib.php b/grade/grading/form/guide/lib.php
@@ -506,6 +506,14 @@ public function render_preview(moodle_page $page) {
         $comments = $this->definition->guide_comment;
         $options = $this->get_options();
         $guide = '';
+        if (has_capability('moodle/grade:managegradingforms', $page->context)) {
+            $showdescription = true;
+        } else {
+            $showdescription = $options['showdescriptionstudent'];
+        }
+        if ($showdescription) {
+            $guide .= $output->box($this->get_formatted_description(), 'gradingform_guide-description');
+        }
         if (has_capability('moodle/grade:managegradingforms', $page->context)) {
             $guide .= $output->display_guide_mapping_explained($this->get_min_max_score());
             $guide .= $output->display_guide($criteria, $comments, $options, self::DISPLAY_PREVIEW, 'guide');

diff --git a/grade/grading/form/guide/preview.php b/grade/grading/form/guide/preview.php
@@ -49,8 +49,5 @@
 
 echo $OUTPUT->header();
 echo $OUTPUT->heading($title);
-if (!empty($options['showdescriptionstudent'])) {
-    echo $OUTPUT->box($controller->get_formatted_description(), 'gradingform_guide-description');
-}
 echo $controller->render_preview($PAGE);
 echo $OUTPUT->footer();
diff --git a/grade/grading/form/rubric/lib.php b/grade/grading/form/rubric/lib.php
@@ -508,6 +508,14 @@ public function render_preview(moodle_page $page) {
         $criteria = $this->definition->rubric_criteria;
         $options = $this->get_options();
         $rubric = '';
+        if (has_capability('moodle/grade:managegradingforms', $page->context)) {
+            $showdescription = true;
+        } else {
+            $showdescription = $options['showdescriptionstudent'];
+        }
+        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');

diff --git a/grade/grading/form/rubric/preview.php b/grade/grading/form/rubric/preview.php
@@ -49,8 +49,5 @@
 
 echo $OUTPUT->header();
 echo $OUTPUT->heading($title);
-if (!empty($options['showdescriptionstudent'])) {
-    echo $OUTPUT->box($controller->get_formatted_description(), 'gradingform_rubric-description');
-}
 echo $controller->render_preview($PAGE);
 echo $OUTPUT->footer();
diff --git a/grade/grading/manage.php b/grade/grading/manage.php
@@ -233,7 +233,6 @@
             $tag = html_writer::tag('span', get_string('statusdraft', 'core_grading'), array('class' => 'status draft'));
         }
         echo $output->heading(s($definition->name) . ' ' . $tag, 3, 'definition-name');
-        echo $output->box($controller->get_formatted_description());
         echo $output->box($controller->render_preview($PAGE), 'definition-preview');
     }
 }