MDL-11275 added (submissions). Also fixed :

Issue:
    Teachers can edit grader report preferences (including switches for quickgrading and
    quickfeedback), but do not have access to the "Turn editing on/off" button, so they
    can't do quickgrading.
Solutions:
    1.Decouple the quickgrading and quickfeedback modes from the editing mode,
        and turn them on/off through the preferences page. New capability: moodle/grade:edit
        * preferences: don't show quickgrading if no capability grade:edit
        * If quickgrading is switched off as a preference and user doesn't have manage cap, show edit icons around grades when in editing mode

diff --git a/grade/edit/tree/grade.php b/grade/edit/tree/grade.php
index 4be6e63f2bb82f7e53ce28cf78a3f336690c2e0d..d7c2991df828d8e52c30631ce25183d178400a20 100644 (file)
--- a/grade/edit/tree/grade.php
+++ b/grade/edit/tree/grade.php
@@ -17,7 +17,7 @@ if (!$course = get_record('course', 'id', $courseid)) {
 require_login($course);
 $context = get_context_instance(CONTEXT_COURSE, $course->id);
 if (!has_capability('moodle/grade:manage', $context)) {
-    require_capability('moodle/grade:override', $context);
+    require_capability('moodle/grade:edit', $context);
 }
 
 // default return url
@@ -191,7 +191,7 @@ if ($mform->is_cancelled()) {
         $grade_grade->set_excluded($data->excluded);
     }
 
-    if (isset($data->overridden) and has_capability('moodle/grade:manage', $context) or has_capability('moodle/grade:override', $context)) {
+    if (isset($data->overridden) and has_capability('moodle/grade:manage', $context) or has_capability('moodle/grade:edit', $context)) {
         // ignore overridden flag when changing final grade
         if ($old_grade_grade->finalgrade == $grade_grade->finalgrade) {
             $grade_grade->set_overridden($data->overridden);

diff --git a/grade/lib.php b/grade/lib.php
index e4f684f71b0b398850a9b47bbde35c88afb8dd3a..34f5d9b1e801bdd4a2e4d02a2afd5437dc7b6c6e 100644 (file)
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -967,7 +967,7 @@ class grade_tree {
         global $CFG;
 
         if (!has_capability('moodle/grade:manage', $this->context)) {
-            if ($element['type'] == 'grade' and has_capability('moodle/grade:override', $this->context)) {
+            if ($element['type'] == 'grade' and has_capability('moodle/grade:edit', $this->context)) {
                 // oki - let them override grade
             } else {
                 return '';

diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php
index 4663028da819409598fbcb56cbc08dc710b6f804..4576e518ea7cb6c79398117dbd67168534f11843 100644 (file)
--- a/grade/report/grader/index.php
+++ b/grade/report/grader/index.php
@@ -73,7 +73,7 @@ if (!isset($USER->gradeediting)) {
     $USER->gradeediting = array();
 }
 
-if (has_capability('moodle/grade:override', $context)) {
+if (has_capability('moodle/grade:edit', $context)) {
     if (!isset($USER->gradeediting[$course->id])) {
         $USER->gradeediting[$course->id] = 0;
     }

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 83cad02c9300d1bbcb25425757d6a24225cfb1fd..2391b73f640ca8b94138ba5419760e79cb50b30b 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -121,7 +121,7 @@ class grade_report_grader extends grade_report {
      */
     function process_data($data) {
 
-        if (!has_capability('moodle/grade:override', $this->context)) {
+        if (!has_capability('moodle/grade:edit', $this->context)) {
             return false;
         }
 
@@ -591,7 +591,7 @@ class grade_report_grader extends grade_report {
             $scales_list = substr($scales_list, 0, -1);
             $scales_array = get_records_list('scale', 'id', $scales_list);
         }
-        
+
         $canviewhidden = has_capability('moodle/grade:viewhidden', get_context_instance(CONTEXT_COURSE, $this->course->id));
 
         foreach ($this->users as $userid => $user) {
@@ -629,7 +629,7 @@ class grade_report_grader extends grade_report {
                         $studentshtml .= '<td class="cell c'.$columncount++.'">'.userdate($grade->timecreated,get_string('strftimedatetimeshort')).'</td>';                  } else {
                         $studentshtml .= '<td class="cell c'.$columncount++.'">-</td>';
                     }
-                    continue; 
+                    continue;
                 }
 
                 $grade->courseid = $this->courseid;
@@ -822,6 +822,10 @@ class grade_report_grader extends grade_report {
             $groupwheresql = null;
         }
 
+        if ($shownumberofgrades) {
+            $straverage .= ' (' . get_string('submissions', 'grades') . ') ';
+        }
+
         $totalcount = $this->get_numusers($grouponly);
 
         if ($showaverages) {
@@ -1024,16 +1028,19 @@ class grade_report_grader extends grade_report {
         $show_hide_icon        = '';
         $lock_unlock_icon      = '';
 
-        if ($this->get_pref('showcalculations')) {
-            $edit_calculation_icon = $this->gtree->get_calculation_icon($element, $this->gpr);
-        }
+        if (has_capability('moodle/grade:manage', $this->context)) {
 
-        if ($this->get_pref('showeyecons')) {
-           $show_hide_icon = $this->gtree->get_hiding_icon($element, $this->gpr);
-        }
+            if ($this->get_pref('showcalculations')) {
+                $edit_calculation_icon = $this->gtree->get_calculation_icon($element, $this->gpr);
+            }
+
+            if ($this->get_pref('showeyecons')) {
+               $show_hide_icon = $this->gtree->get_hiding_icon($element, $this->gpr);
+            }
 
-        if ($this->get_pref('showlocks')) {
-            $lock_unlock_icon = $this->gtree->get_locking_icon($element, $this->gpr);
+            if ($this->get_pref('showlocks')) {
+                $lock_unlock_icon = $this->gtree->get_locking_icon($element, $this->gpr);
+            }
         }
 
         return '<div class="grade_icons">'.$edit_icon.$edit_calculation_icon.$show_hide_icon.$lock_unlock_icon.'</div>';

diff --git a/grade/report/grader/preferences.php b/grade/report/grader/preferences.php
index df0767200865d4753247bf1afe5cd51693f7f6ba..8c714c29faa2968cc0a6f006f99ba0d4dddc6d2a 100644 (file)
--- a/grade/report/grader/preferences.php
+++ b/grade/report/grader/preferences.php
@@ -38,7 +38,7 @@ if (!$course = get_record('course', 'id', $courseid)) {
 require_login($course->id);
 
 $context = get_context_instance(CONTEXT_COURSE, $course->id);
-require_capability('moodle/grade:manage', $context);
+require_capability('gradereport/grader:view', $context);
 
 // If data submitted, then process and store.
 if ($data = data_submitted()) {

diff --git a/grade/report/grader/preferences_form.php b/grade/report/grader/preferences_form.php
index bf2542a89209dc46197d88b966b1a736bce332c1..acc5b33cf0254df1a4502bfe5483370e0ba4150c 100644 (file)
--- a/grade/report/grader/preferences_form.php
+++ b/grade/report/grader/preferences_form.php
@@ -14,6 +14,7 @@ class grader_report_preferences_form extends moodleform {
         $mform    =& $this->_form;
         $course   = $this->_customdata['course'];
 
+        $context = get_context_instance(CONTEXT_COURSE, $course->id);
         $systemcontext = get_context_instance(CONTEXT_SYSTEM);
 
         $strgradeboundary       = get_string('gradeboundary', 'grades');
@@ -35,59 +36,75 @@ class grader_report_preferences_form extends moodleform {
 /// form definition with preferences defaults
 //--------------------------------------------------------------------------------
         $preferences = array();
-        $preferences['prefgeneral'] = array(
-                      'studentsperpage'     => 'text',
-                      'quickgrading'        => $checkbox_default,
-                      'quickfeedback'       => $checkbox_default,
-                      'decimalpoints'       => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default', 0, 1, 2, 3, 4, 5),
-                      'aggregationposition' => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
-                                                     GRADE_REPORT_AGGREGATION_POSITION_LEFT => get_string('left', 'grades'),
-                                                     GRADE_REPORT_AGGREGATION_POSITION_RIGHT => get_string('right', 'grades')),
-                      'aggregationview'     => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
-                                                     GRADE_REPORT_AGGREGATION_VIEW_FULL => get_string('fullmode', 'grades'),
-                                                     GRADE_REPORT_AGGREGATION_VIEW_AGGREGATES_ONLY => get_string('aggregatesonly', 'grades'),
-                                                     GRADE_REPORT_AGGREGATION_VIEW_GRADES_ONLY => get_string('gradesonly', 'grades')),
-                      'gradedisplaytype'    => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
-                                                     GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
-                                                     GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
-                                                     GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades')),
-                      'meanselection'       => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
-                                                     GRADE_REPORT_MEAN_ALL => get_string('meanall', 'grades'),
-                                                     GRADE_REPORT_MEAN_GRADED => get_string('meangraded', 'grades')),
-                      'enableajax'          => $checkbox_default);
-
-        $preferences['prefshow'] = array('showcalculations'  => $checkbox_default,
-                                         'showeyecons'       => $checkbox_default,
-                                         'showaverages'      => $checkbox_default,
-                                         'showgroups'        => $checkbox_default,
-                                         'showlocks'         => $checkbox_default,
-                                         'showranges'        => $checkbox_default,
-                                         'showuserimage'     => $checkbox_default,
-                                         'showactivityicons' => $checkbox_default);
-
-        $preferences['prefrows'] = array(
-                    'shownumberofgrades'  => $checkbox_default,
-                    'averagesdisplaytype'    => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
-                                                      GRADE_REPORT_PREFERENCE_INHERIT => $strinherit,
-                                                      GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
-                                                      GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
-                                                      GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades')),
-                    'rangesdisplaytype'      => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
-                                                      GRADE_REPORT_PREFERENCE_INHERIT => $strinherit,
-                                                      GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
-                                                      GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
-                                                      GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades')),
-                    'averagesdecimalpoints'  => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
-                                                      GRADE_REPORT_PREFERENCE_INHERIT => $strinherit, 0, 1, 2, 3, 4, 5),
-                    'rangesdecimalpoints'    => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
-                                                      GRADE_REPORT_PREFERENCE_INHERIT => $strinherit, 0, 1, 2, 3, 4, 5));
-
-
-        for ($i = 1; $i <= 10; $i++) {
-            $preferences['prefletters']['gradeletter' . $i] = 'text';
-            $preferences['prefletters']['gradeboundary' . $i] = $percentages;
+
+        // Initialise the preferences arrays with grade:manage capabilities
+        if (has_capability('moodle/grade:manage', $context)) {
+            $preferences['prefgeneral'] = array(
+                          'decimalpoints'       => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default', 0, 1, 2, 3, 4, 5),
+                          'aggregationview'     => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
+                                                         GRADE_REPORT_AGGREGATION_VIEW_FULL => get_string('fullmode', 'grades'),
+                                                         GRADE_REPORT_AGGREGATION_VIEW_AGGREGATES_ONLY => get_string('aggregatesonly', 'grades'),
+                                                         GRADE_REPORT_AGGREGATION_VIEW_GRADES_ONLY => get_string('gradesonly', 'grades')),
+                          'gradedisplaytype'    => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
+                                                         GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
+                                                         GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
+                                                         GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades')),
+                          'meanselection'       => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
+                                                         GRADE_REPORT_MEAN_ALL => get_string('meanall', 'grades'),
+                                                         GRADE_REPORT_MEAN_GRADED => get_string('meangraded', 'grades')));
+
+
+            $preferences['prefshow'] = array('showcalculations'  => $checkbox_default,
+                                             'showeyecons'       => $checkbox_default,
+                                             'showaverages'      => $checkbox_default,
+                                             'showgroups'        => $checkbox_default,
+                                             'showlocks'         => $checkbox_default);
+
+            $preferences['prefrows'] = array(
+                        'averagesdisplaytype'    => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
+                                                          GRADE_REPORT_PREFERENCE_INHERIT => $strinherit,
+                                                          GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
+                                                          GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
+                                                          GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades')),
+                        'rangesdisplaytype'      => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
+                                                          GRADE_REPORT_PREFERENCE_INHERIT => $strinherit,
+                                                          GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
+                                                          GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
+                                                          GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades')),
+                        'averagesdecimalpoints'  => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
+                                                          GRADE_REPORT_PREFERENCE_INHERIT => $strinherit, 0, 1, 2, 3, 4, 5),
+                        'rangesdecimalpoints'    => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
+                                                          GRADE_REPORT_PREFERENCE_INHERIT => $strinherit, 0, 1, 2, 3, 4, 5));
+
+
+            for ($i = 1; $i <= 10; $i++) {
+                $preferences['prefletters']['gradeletter' . $i] = 'text';
+                $preferences['prefletters']['gradeboundary' . $i] = $percentages;
+            }
         }
 
+        // quickgrading and quickfeedback are conditional on grade:edit capability
+        if (has_capability('moodle/grade:edit', $context)) {
+            $preferences['prefgeneral']['quickgrading'] = $checkbox_default;
+            $preferences['prefgeneral']['quickfeedback'] = $checkbox_default;
+        }
+
+        // View capability is the lowest permission. Users with grade:manage or grade:edit must also have grader:view
+        if (has_capability('gradereport/grader:view', $context)) {
+            $preferences['prefgeneral']['studentsperpage'] = 'text';
+            $preferences['prefgeneral']['aggregationposition'] = array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
+                                                                     GRADE_REPORT_AGGREGATION_POSITION_LEFT => get_string('left', 'grades'),
+                                                                     GRADE_REPORT_AGGREGATION_POSITION_RIGHT => get_string('right', 'grades'));
+            $preferences['prefgeneral']['enableajax'] = $checkbox_default;
+
+            $preferences['prefshow']['showuserimage'] = $checkbox_default;
+            $preferences['prefshow']['showactivityicons'] = $checkbox_default;
+            $preferences['prefshow']['showranges'] = $checkbox_default;
+
+            $preferences['prefrows']['shownumberofgrades'] = $checkbox_default;
+        }
+
+
         foreach ($preferences as $group => $prefs) {
             $mform->addElement('header', $group, get_string($group, 'grades'));
 

diff --git a/grade/report/grader/tabs.php b/grade/report/grader/tabs.php
index f1a4d3572c8031e664e3904986656e7157351a91..6e47d412816a4471f73834701ebf5d9862764ac8 100644 (file)
--- a/grade/report/grader/tabs.php
+++ b/grade/report/grader/tabs.php
@@ -1,10 +1,12 @@
 <?php  // $Id$
     $row = $tabs = array();
-
+    $tabcontext = get_context_instance(CONTEXT_COURSE, $COURSE->id);
     $row[] = new tabobject('graderreport',
                            $CFG->wwwroot.'/grade/report/grader/index.php?id='.$courseid,
                            get_string('modulename', 'gradereport_grader'));
-    if (has_capability('moodle/grade:manage', get_context_instance(CONTEXT_COURSE, $COURSE->id))) {
+    if (has_capability('moodle/grade:manage',$tabcontext ) ||
+        has_capability('moodle/grade:edit', $tabcontext) ||
+        has_capability('gradereport/grader:view', $tabcontext)) {
         $row[] = new tabobject('preferences',
                                $CFG->wwwroot.'/grade/report/grader/preferences.php?id='.$courseid,
                                get_string('preferences'));

diff --git a/grade/report/grader/version.php b/grade/report/grader/version.php
index 48c48f45d40ffc85f441ee39e43ede824180df81..66ba339e4313db6d995fbe7b209deea730e3b1c3 100644 (file)
--- a/grade/report/grader/version.php
+++ b/grade/report/grader/version.php
@@ -1,6 +1,6 @@
 <?PHP // $Id$
 
-$plugin->version  = 2007091400;
-$plugin->requires = 2007091400;
+$plugin->version  = 2007091700;
+$plugin->requires = 2007091700;
 
 ?>

diff --git a/lang/en_utf8/role.php b/lang/en_utf8/role.php
index 9237fd102eb249a556314eb23117ce40ea37bf58..7f6e73cac96f89ba75c2b25ecc90464040e45354 100644 (file)
--- a/lang/en_utf8/role.php
+++ b/lang/en_utf8/role.php
@@ -44,6 +44,7 @@ $string['course:viewhiddenuserfields'] = 'View hidden user fields';
 $string['course:viewparticipants'] = 'View participants';
 $string['course:viewscales'] = 'View scales';
 $string['course:visibility'] = 'Hide/show courses';
+$string['grade:edit'] = 'Edit grades';
 $string['grade:export'] = 'Export grades';
 $string['grade:hide'] = 'Hide/unhide grades or items';
 $string['grade:import'] = 'Import grades';

diff --git a/lib/db/access.php b/lib/db/access.php
index bd22cdf7edc40ed08b99929f11b766ba532eb972..096ec93ae8702eee82b26e0b3011046dedb14cd1 100644 (file)
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -518,7 +518,7 @@ $moodle_capabilities = array(
             'coursecreator' => CAP_ALLOW,
             'teacher' => CAP_ALLOW,
             'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW            
+            'admin' => CAP_ALLOW
         )
     ),
 
@@ -740,26 +740,26 @@ $moodle_capabilities = array(
         )
     ),
 
-    'moodle/user:editownprofile' => array(      
+    'moodle/user:editownprofile' => array(
 
-        'captype' => 'write',     
-        'contextlevel' => CONTEXT_SYSTEM,      
-        'legacy' => array(   
+        'captype' => 'write',
+        'contextlevel' => CONTEXT_SYSTEM,
+        'legacy' => array(
             'guest' => CAP_PROHIBIT,
             'user' => CAP_ALLOW,
             'admin' => CAP_ALLOW
-        )    
+        )
     ),
 
-    'moodle/user:changeownpassword' => array(      
+    'moodle/user:changeownpassword' => array(
 
-        'captype' => 'write',     
-        'contextlevel' => CONTEXT_SYSTEM,      
-        'legacy' => array(   
+        'captype' => 'write',
+        'contextlevel' => CONTEXT_SYSTEM,
+        'legacy' => array(
             'guest' => CAP_PROHIBIT,
             'user' => CAP_ALLOW,
             'admin' => CAP_ALLOW
-        )    
+        )
     ),
 
     // The next 3 might make no sense for some roles, e.g teacher, etc.
@@ -807,8 +807,8 @@ $moodle_capabilities = array(
             'editingteacher' => CAP_ALLOW,
             'admin' => CAP_ALLOW
         )
-    ),    
-    
+    ),
+
     //new in moodle 1.9
     'moodle/question:add' => array(
         'riskbitmask' => RISK_SPAM,
@@ -828,7 +828,7 @@ $moodle_capabilities = array(
             'editingteacher' => CAP_ALLOW,
             'admin' => CAP_ALLOW
         ),
-        'clonepermissionsfrom' =>  'moodle/question:manage' 
+        'clonepermissionsfrom' =>  'moodle/question:manage'
     ),
     'moodle/question:editall' => array(
         'riskbitmask' => RISK_SPAM,
@@ -838,7 +838,7 @@ $moodle_capabilities = array(
             'editingteacher' => CAP_ALLOW,
             'admin' => CAP_ALLOW
         ),
-        'clonepermissionsfrom' =>  'moodle/question:manage' 
+        'clonepermissionsfrom' =>  'moodle/question:manage'
     ),
     'moodle/question:viewmine' => array(
         'captype' => 'read',
@@ -847,7 +847,7 @@ $moodle_capabilities = array(
             'editingteacher' => CAP_ALLOW,
             'admin' => CAP_ALLOW
         ),
-        'clonepermissionsfrom' =>  'moodle/question:manage' 
+        'clonepermissionsfrom' =>  'moodle/question:manage'
     ),
     'moodle/question:viewall' => array(
         'captype' => 'read',
@@ -856,7 +856,7 @@ $moodle_capabilities = array(
             'editingteacher' => CAP_ALLOW,
             'admin' => CAP_ALLOW
         ),
-        'clonepermissionsfrom' =>  'moodle/question:manage' 
+        'clonepermissionsfrom' =>  'moodle/question:manage'
     ),
     'moodle/question:usemine' => array(
         'captype' => 'read',
@@ -865,7 +865,7 @@ $moodle_capabilities = array(
             'editingteacher' => CAP_ALLOW,
             'admin' => CAP_ALLOW
         ),
-        'clonepermissionsfrom' =>  'moodle/question:manage' 
+        'clonepermissionsfrom' =>  'moodle/question:manage'
     ),
     'moodle/question:useall' => array(
         'captype' => 'read',
@@ -874,8 +874,8 @@ $moodle_capabilities = array(
             'editingteacher' => CAP_ALLOW,
             'admin' => CAP_ALLOW
         ),
-        'clonepermissionsfrom' =>  'moodle/question:manage' 
-    ),    
+        'clonepermissionsfrom' =>  'moodle/question:manage'
+    ),
     'moodle/question:movemine' => array(
         'captype' => 'write',
         'contextlevel' => CONTEXT_COURSE,
@@ -883,7 +883,7 @@ $moodle_capabilities = array(
             'editingteacher' => CAP_ALLOW,
             'admin' => CAP_ALLOW
         ),
-        'clonepermissionsfrom' =>  'moodle/question:manage' 
+        'clonepermissionsfrom' =>  'moodle/question:manage'
     ),
     'moodle/question:moveall' => array(
         'captype' => 'write',
@@ -892,10 +892,10 @@ $moodle_capabilities = array(
             'editingteacher' => CAP_ALLOW,
             'admin' => CAP_ALLOW
         ),
-        'clonepermissionsfrom' =>  'moodle/question:manage' 
+        'clonepermissionsfrom' =>  'moodle/question:manage'
     ),
     //END new in moodle 1.9
-    
+
     // Configure the installed question types.
     'moodle/question:config' => array(
 
@@ -1031,8 +1031,8 @@ $moodle_capabilities = array(
         'clonepermissionsfrom' => 'moodle/course:managegrades'
     ),
 
-    'moodle/grade:manageoutcomes' => array(
-        'riskbitmask' => RISK_PERSONAL,
+    'moodle/grade:edit' => array(
+        'riskbitmask' => RISK_PERSONAL | RISK_XSS,
         'captype' => 'write',
         'contextlevel' => CONTEXT_COURSE,
         'legacy' => array(
@@ -1042,16 +1042,18 @@ $moodle_capabilities = array(
         'clonepermissionsfrom' => 'moodle/course:managegrades'
     ),
 
-    'moodle/grade:hide' => array(
+    'moodle/grade:manageoutcomes' => array(
+        'riskbitmask' => RISK_PERSONAL,
         'captype' => 'write',
         'contextlevel' => CONTEXT_COURSE,
         'legacy' => array(
             'editingteacher' => CAP_ALLOW,
             'admin' => CAP_ALLOW
-        )
+        ),
+        'clonepermissionsfrom' => 'moodle/course:managegrades'
     ),
 
-    'moodle/grade:lock' => array(
+    'moodle/grade:hide' => array(
         'captype' => 'write',
         'contextlevel' => CONTEXT_COURSE,
         'legacy' => array(
@@ -1060,7 +1062,7 @@ $moodle_capabilities = array(
         )
     ),
 
-    'moodle/grade:unlock' => array(
+    'moodle/grade:lock' => array(
         'captype' => 'write',
         'contextlevel' => CONTEXT_COURSE,
         'legacy' => array(
@@ -1069,7 +1071,7 @@ $moodle_capabilities = array(
         )
     ),
 
-    'moodle/grade:override' => array(
+    'moodle/grade:unlock' => array(
         'captype' => 'write',
         'contextlevel' => CONTEXT_COURSE,
         'legacy' => array(
@@ -1124,7 +1126,7 @@ $moodle_capabilities = array(
             'user' => CAP_ALLOW
         )
     ),
-    
+
     'moodle/tag:edit' => array(
         'captype' => 'write',
         'contextlevel' => CONTEXT_SYSTEM,
@@ -1133,7 +1135,7 @@ $moodle_capabilities = array(
             'user' => CAP_ALLOW
         )
     ),
-    
+
     'moodle/tag:editblocks' => array(
         'captype' => 'write',
         'contextlevel' => CONTEXT_SYSTEM,

diff --git a/version.php b/version.php
index a772fdffba0af9c5e52c456a9675dd01bd3461d4..3dbd3aca9ae5831183720f80543376e6ce0ace73 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2007091401;  // YYYYMMDD = date
+    $version = 2007091702;  // YYYYMMDD = date
                             //       XY = increments within a single day
 
     $release = '1.9 Beta +';   // Human-friendly version name