Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix visual bug with large file error msg in cms.

Browse Source 
This hotfix patches the functionality of the GridFS PR
by dismissing the error msg when the user uploads a large
file and fails, then uploads a regular file. This
includes a Jasmine test to cover this case.
This commit is contained in:
ataki
2014-12-28 01:59:45 -08:00
parent 66e6d1cf7a
commit 2b18f3213f
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cms/static/js/spec/views/assets_spec.js
View File

@@ -169,6 +169,21 @@ define([ "jquery", "js/common_helpers/ajax_helpers", "js/views/asset", "js/views
expect(assetsView.largeFileErrorMsg).toBeNull();
});
it('hides the error modal if a large file, then small file is uploaded', function() {
expect(assetsView).toBeDefined();
mockFileUpload.files[0].size = assetsView.maxFileSize;
$('.choose-file-button').click();
$(".upload-modal .file-chooser").fileupload('add', mockFileUpload);
expect(assetsView.largeFileErrorMsg).toBeDefined();
mockFileUpload.files[0].size = assetsView.maxFileSize / 10;
$('.choose-file-button').click();
$(".upload-modal .file-chooser").fileupload('add', mockFileUpload);
expect(assetsView.largeFileErrorMsg).toBeNull();
});
});
});
});

4
cms/static/js/views/assets.js
View File

@@ -135,6 +135,7 @@ define(["jquery", "underscore", "gettext", "js/models/asset", "js/views/paging",
event.preventDefault();
self.resetUploadModal();
ModalUtils.showModal();
$('.modal-cover').on('click', self.hideModal);
$('.file-input').bind('change', self.startUpload);
$('.upload-modal .file-chooser').fileupload({
dataType: 'json',
@@ -182,6 +183,9 @@ define(["jquery", "underscore", "gettext", "js/models/asset", "js/views/paging",
showFileSelectionMenu: function(event) {
event.preventDefault();
if (assetsView.largeFileErrorMsg) {
assetsView.largeFileErrorMsg.hide();
}
$('.file-input').click();
},