Merge branch 'MDL-36905_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

This commit is contained in:
Sam Hemelryk
2012-12-11 15:44:32 +13:00
3 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -58,7 +58,7 @@ class mod_assign_grading_batch_operations_form extends moodleform {
$mform->addElement('hidden', 'returnaction', 'grading');
$objs = array();
$objs[] =& $mform->createElement('select', 'operation', '', $options);
$objs[] =& $mform->createElement('select', 'operation', get_string('chooseoperation', 'assign'), $options);
$objs[] =& $mform->createElement('submit', 'submit', get_string('go'));
$mform->addElement('group', 'actionsgrp', get_string('batchoperationsdescription', 'assign'), $objs, ' ', false);
+2
View File
@@ -65,6 +65,8 @@ $string['batchoperationlock'] = 'lock submissions';
$string['batchoperationunlock'] = 'unlock submissions';
$string['batchoperationreverttodraft'] = 'revert submissions to draft';
$string['changegradewarning'] = 'This assignment has graded submissions and changing the grade will not automatically re-calculate existing submission grades. You must re-grade all existing submissions, if you wish to change the grade.';
$string['choosegradingaction'] = 'Grading action';
$string['chooseoperation'] = 'Choose operation';
$string['comment'] = 'Comment';
$string['conversionexception'] = 'Could not convert assignment. Exception was: {$a}.';
$string['configshowrecentsubmissions'] = 'Everyone can see notifications of submissions in recent activity reports.';
+1
View File
@@ -1838,6 +1838,7 @@ class assign {
}
$gradingactions = new url_select($links);
$gradingactions->set_label(get_string('choosegradingaction', 'assign'));
$gradingmanager = get_grading_manager($this->get_context(), 'mod_assign', 'submissions');