moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
mod/assign/locallib.php
View file

@ -3635,7 +3635,9 @@ class assign {
'showquickgrading'=>false));
if ($formdata = $mform->get_data()) {
set_user_preference('assign_perpage', $formdata->perpage);
set_user_preference('assign_filter', $formdata->filter);
if (isset($formdata->filter)) {
set_user_preference('assign_filter', $formdata->filter);
}
}
}
@ -4794,4 +4796,4 @@ class assign_portfolio_caller extends portfolio_module_caller_base {
return array(PORTFOLIO_FORMAT_FILE, PORTFOLIO_FORMAT_LEAP2A);
}
}
}

8
mod/assign/module.js
View file

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