Merge branch 'MDL-36051_24' of git://github.com/rlorenzo/moodle

This commit is contained in:
Dan Poltawski 2012-11-08 15:09:59 +08:00
commit aa289da834
2 changed files with 9 additions and 5 deletions

View file

@ -3635,9 +3635,11 @@ class assign {
'showquickgrading'=>false)); 'showquickgrading'=>false));
if ($formdata = $mform->get_data()) { if ($formdata = $mform->get_data()) {
set_user_preference('assign_perpage', $formdata->perpage); set_user_preference('assign_perpage', $formdata->perpage);
if (isset($formdata->filter)) {
set_user_preference('assign_filter', $formdata->filter); set_user_preference('assign_filter', $formdata->filter);
} }
} }
}
/** /**
* Take a grade object and print a short summary for the log file. * Take a grade object and print a short summary for the log file.

View file

@ -127,9 +127,11 @@ M.mod_assign.init_grading_options = function(Y) {
Y.one('form.gradingoptionsform').submit(); Y.one('form.gradingoptionsform').submit();
}); });
var filterelement = Y.one('#id_filter'); var filterelement = Y.one('#id_filter');
if (filterelement) {
filterelement.on('change', function(e) { filterelement.on('change', function(e) {
Y.one('form.gradingoptionsform').submit(); Y.one('form.gradingoptionsform').submit();
}); });
}
var quickgradingelement = Y.one('#id_quickgrading'); var quickgradingelement = Y.one('#id_quickgrading');
if (quickgradingelement) { if (quickgradingelement) {
quickgradingelement.on('change', function(e) { quickgradingelement.on('change', function(e) {