Merge pull request #481 from edx/sanchez/better-image-submission-errors

Fixing error toggling for server-side errors.

openassessment/xblock/static/js/src/oa_response.js

@@ -451,7 +451,6 @@ OpenAssessment.ResponseView.prototype = {
         var view = this;
         var fileUpload = $("#file__upload");
         fileUpload.addClass("is--disabled");
-        var errorMsg = null;
 
         // Call getUploadUrl to get the one-time upload URL for this file. Once
         // completed, execute a sequential AJAX call to upload to the returned
@@ -468,18 +467,17 @@ OpenAssessment.ResponseView.prototype = {
                 contentType: view.imageType,
                 success: function(data, textStatus, jqXHR) {
                     view.imageUrl();
+                    this.baseView.toggleActionError('upload', null);
                 },
                 error: function(jqXHR, textStatus, errorThrown) {
-                    errorMsg = textStatus;
+                    view.baseView.toggleActionError('upload', textStatus);
+                    fileUpload.removeClass("is--disabled");
                 }
             });
         }).fail(function(errMsg) {
-            errorMsg = errMsg;
-        });
-        if (errorMsg != null) {
-            view.baseView.toggleActionError('upload', errorMsg);
+            view.baseView.toggleActionError('upload', errMsg);
             fileUpload.removeClass("is--disabled");
-        }
+        });
     },
 
     /**

openassessment/xblock/test/data/serialize.json

@@ -725,6 +725,7 @@
         "due": null,
         "submission_start": null,
         "submission_due": null,
+        "allow_file_upload": null,
         "criteria": [
             {
                 "order_num": 0,