MDL-11583 fixed use of capability moodle/grade:manageletters - now works in plugin...

diff --git a/grade/edit/letter/index.php b/grade/edit/letter/index.php
index f5de74e9913e01a0c4492848b7662f8f450c1803..6aceee9c31820093db3cf6ef4e7ce25f9623370e 100644 (file)
--- a/grade/edit/letter/index.php
+++ b/grade/edit/letter/index.php
@@ -12,7 +12,10 @@ if (!$course = get_record('course', 'id', $courseid)) {
 }
 require_login($course);
 $context = get_context_instance(CONTEXT_COURSE, $course->id);
-require_capability('moodle/grade:manage', $context);
+
+if (!has_capability('moodle/grade:manage', $context) and !has_capability('moodle/grade:manageletters', $context)) {
+    error('Missing permission to view letter grades');
+}
 
 $gpr = new grade_plugin_return(array('type'=>'edit', 'plugin'=>'letter', 'courseid'=>$courseid));
 

diff --git a/grade/lib.php b/grade/lib.php
index 786d1381df8ceb97dd0d4c90ba73969f4ef5e631..79e8b5e5c46fccbd5eda7c04498b15c581eb162f 100644 (file)
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -284,6 +284,7 @@ function print_grade_plugin_selector($courseid, $active_type, $active_plugin, $r
 
 /// editing scripts - not real plugins
     if (has_capability('moodle/grade:manage', $context)
+      or has_capability('moodle/grade:manageletters', $context)
       or has_capability('moodle/course:managescales', $context)
       or has_capability('moodle/course:update', $context)) {
         $menu['edit']='--'.get_string('edit');
@@ -317,7 +318,7 @@ function print_grade_plugin_selector($courseid, $active_type, $active_plugin, $r
             $menu[$url] = get_string('outcomes', 'grades');
         }
 
-        if (has_capability('moodle/course:manage', $context)) {
+        if (has_capability('moodle/grade:manage', $context) or has_capability('moodle/grade:manageletters', $context)) {
             $url = 'edit/letter/index.php?id='.$courseid;
             if ($active_type == 'edit' and $active_plugin == 'letter' ) {
                 $active = $url;

diff --git a/lang/en_utf8/role.php b/lang/en_utf8/role.php
index 7f6e73cac96f89ba75c2b25ecc90464040e45354..e04da188058dc62118469691ebcd6d1cdcedbc5c 100644 (file)
--- a/lang/en_utf8/role.php
+++ b/lang/en_utf8/role.php
@@ -50,6 +50,7 @@ $string['grade:hide'] = 'Hide/unhide grades or items';
 $string['grade:import'] = 'Import grades';
 $string['grade:lock'] = 'Lock grades or items';
 $string['grade:manage'] = 'Manage grade items';
+$string['grade:manageletters'] = 'Manage letter grades';
 $string['grade:manageoutcomes'] = 'Manage grade outcomes';
 $string['grade:override'] = 'Override grades';
 $string['grade:unlock'] = 'Unlock grades or items';