From dbe93bc7c7adc2f805f8a4bb28befc4b32424cec Mon Sep 17 00:00:00 2001
From: Charles Fulton <mackensen@gmail.com>
Date: Fri, 13 Jan 2012 10:40:48 -0800
Subject: [PATCH 1/2] MDL-31158 make grade recovery site-configurable

---
 admin/settings/grades.php                         | 2 ++
 enrol/manual/lib.php                              | 8 +++++++-
 enrol/manual/yui/quickenrolment/quickenrolment.js | 8 ++++++--
 lang/en/grades.php                                | 2 ++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/admin/settings/grades.php b/admin/settings/grades.php
index 95aee449035..9915909e15c 100644
--- a/admin/settings/grades.php
+++ b/admin/settings/grades.php
@@ -58,6 +58,8 @@ if (has_capability('moodle/grade:manage', $systemcontext)
                                                         GRADE_NAVMETHOD_TABS => new lang_string('tabs', 'grades'),
                                                         GRADE_NAVMETHOD_COMBO => new lang_string('combo', 'grades'))));
 
+        $temp->add(new admin_setting_configcheckbox('recovergradesdefault', new lang_string('recovergradesdefault', 'grades'), new lang_string('recovergradesdefault_help', 'grades'), 0));
+
         $temp->add(new admin_setting_special_gradeexport());
 
         $temp->add(new admin_setting_special_gradelimiting());
diff --git a/enrol/manual/lib.php b/enrol/manual/lib.php
index b2e8501812f..84ea8daf80e 100644
--- a/enrol/manual/lib.php
+++ b/enrol/manual/lib.php
@@ -224,8 +224,14 @@ class enrol_manual_plugin extends enrol_plugin {
             'url'                 => $manager->get_moodlepage()->url->out(false),
             'optionsStartDate'    => $startdateoptions,
             'defaultRole'         => $instance->roleid,
-            'disableGradeHistory' => $CFG->disablegradehistory
+            'disableGradeHistory' => $CFG->disablegradehistory,
+            'recoverGradesDefault'=> ''
         );
+        
+        if ($CFG->recovergradesdefault) {
+            $arguments['recoverGradesDefault'] = ' checked="checked"';
+        }
+        
         $function = 'M.enrol_manual.quickenrolment.init';
         $button->require_yui_module($modules, $function, array($arguments));
         $button->strings_for_js(array(
diff --git a/enrol/manual/yui/quickenrolment/quickenrolment.js b/enrol/manual/yui/quickenrolment/quickenrolment.js
index 9ed9fbbdac9..d5658b464b9 100644
--- a/enrol/manual/yui/quickenrolment/quickenrolment.js
+++ b/enrol/manual/yui/quickenrolment/quickenrolment.js
@@ -21,7 +21,8 @@ YUI.add('moodle-enrol_manual-quickenrolment', function(Y) {
         DEFAULTSTARTDATE : 'defaultStartDate',
         DEFAULTDURATION : 'defaultDuration',
         ASSIGNABLEROLES : 'assignableRoles',
-        DISABLEGRADEHISTORY : 'disableGradeHistory'
+        DISABLEGRADEHISTORY : 'disableGradeHistory',
+        RECOVERGRADESDEFAULT : 'recoverGradesDefault'
     };
     /** CSS classes for nodes in structure **/
     var CSS = {
@@ -78,7 +79,7 @@ YUI.add('moodle-enrol_manual-quickenrolment', function(Y) {
             if (this.get(UEP.DISABLEGRADEHISTORY) != true) {
                 recovergrades = create('<div class="'+CSS.ENROLMENTOPTION+' '+CSS.RECOVERGRADES+'"></div>')
                     .append(create('<label class="'+CSS.RECOVERGRADESTITLE+'" for="'+CSS.RECOVERGRADES+'">'+M.str.enrol.recovergrades+'</label>'))
-                    .append(create('<input type="checkbox" id="'+CSS.RECOVERGRADES+'" name="'+CSS.RECOVERGRADES+'" />'))
+                    .append(create('<input type="checkbox" id="'+CSS.RECOVERGRADES+'" name="'+CSS.RECOVERGRADES+'"'+ this.get(UEP.RECOVERGRADESDEFAULT) +' />'))
             }
 
             this.set(UEP.BASE, create('<div class="'+CSS.PANEL+' '+CSS.HIDDEN+'"></div>')
@@ -504,6 +505,9 @@ YUI.add('moodle-enrol_manual-quickenrolment', function(Y) {
             },
             disableGradeHistory : {
                 value : 0
+            },
+            recoverGradesDefault : {
+                value : ''
             }
         }
     });
diff --git a/lang/en/grades.php b/lang/en/grades.php
index b583effe671..0149b6e1d5d 100644
--- a/lang/en/grades.php
+++ b/lang/en/grades.php
@@ -506,6 +506,8 @@ $string['rawpct'] = 'Raw %';
 $string['real'] = 'Real';
 $string['realletter'] = 'Real (letter)';
 $string['realpercentage'] = 'Real (percentage)';
+$string['recovergradesdefault'] = 'Recover grades';
+$string['recovergradesdefault_help'] = 'Choose whether to always recover grades by default when re-enrolling a student.';
 $string['regradeanyway'] = 'Regrade anyway';
 $string['removeallcoursegrades'] = 'Delete all grades';
 $string['removeallcourseitems'] = 'Delete all items and categories';

From de80da61e859899eeae90cb10db7a4eb5d810124 Mon Sep 17 00:00:00 2001
From: Andrew Davis <andrew@moodle.com>
Date: Wed, 1 Feb 2012 14:06:18 +0700
Subject: [PATCH 2/2] MDL-31158 grade: altered the help string for
 recovergradesdefault

---
 lang/en/grades.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/en/grades.php b/lang/en/grades.php
index 0149b6e1d5d..8d3ae77d278 100644
--- a/lang/en/grades.php
+++ b/lang/en/grades.php
@@ -506,8 +506,8 @@ $string['rawpct'] = 'Raw %';
 $string['real'] = 'Real';
 $string['realletter'] = 'Real (letter)';
 $string['realpercentage'] = 'Real (percentage)';
-$string['recovergradesdefault'] = 'Recover grades';
-$string['recovergradesdefault_help'] = 'Choose whether to always recover grades by default when re-enrolling a student.';
+$string['recovergradesdefault'] = 'Recover grades default';
+$string['recovergradesdefault_help'] = 'By default recover old grades when re-enrolling a user in a course.';
 $string['regradeanyway'] = 'Regrade anyway';
 $string['removeallcoursegrades'] = 'Delete all grades';
 $string['removeallcourseitems'] = 'Delete all items and categories';