From 00917ec682fa2bba1be50501d38c9f9664f9f1d4 Mon Sep 17 00:00:00 2001
From: Rex Lorenzo <rex@oid.ucla.edu>
Date: Wed, 7 Nov 2012 16:26:26 -0800
Subject: [PATCH] MDL-36051 - Quick Grading in Assignment module does not turn
 on in some circumstances * Fixed bug with quick grading when file submission
 is turned off

---
 mod/assign/locallib.php | 4 +++-
 mod/assign/module.js    | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index a4ab9396c51..c057d277852 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -3632,7 +3632,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);
+            }
         }
     }
 
diff --git a/mod/assign/module.js b/mod/assign/module.js
index 3501563f354..12c3eb05cf0 100644
--- a/mod/assign/module.js
+++ b/mod/assign/module.js
@@ -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) {