Skip to content

Commit 4ea88d5

Browse files
committed
MOBILE-1987 assign: Fix uploading offline files error
1 parent b01f619 commit 4ea88d5

File tree

2 files changed

+5
-5
lines changed
  • www
    • addons/mod/assign/controllers
    • core/components/fileuploader/services

2 files changed

+5
-5
lines changed

www/addons/mod/assign/controllers/edit.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,7 @@ angular.module('mm.addons.mod_assign')
9898
});
9999
});
100100
}).catch(function(message) {
101-
if (message) {
102-
$mmUtil.showErrorModal(message);
103-
} else {
104-
$mmUtil.showErrorModal('Error getting assigment data.');
105-
}
101+
$mmUtil.showErrorModalDefault(message, 'Error getting assigment data.');
106102
blockData && blockData.back();
107103
return $q.reject();
108104
});

www/core/components/fileuploader/services/helper.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ angular.module('mm.core.fileuploader')
8888
* @return {Promise} Promise resolved when the user confirms or if there's no need to show a modal.
8989
*/
9090
self.confirmUploadFile = function(size, alwaysConfirm, allowOffline, wifiThreshold, limitedThreshold) {
91+
if (size == 0) {
92+
return $q.when();
93+
}
94+
9195
if (!allowOffline && !$mmApp.isOnline()) {
9296
return $mmLang.translateAndReject('mm.fileuploader.errormustbeonlinetoupload');
9397
}

0 commit comments

Comments
 (0)