Skip to content

Mobile 1412 #377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 10, 2016
Merged

Mobile 1412 #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
428c112
MOBILE-1412 resource: Fix object object error message
dpalou Feb 10, 2016
34a1aee
MOBILE-1412 resource: Update package status when opening file
dpalou Feb 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions www/addons/mod_resource/controllers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ angular.module('mm.addons.mod_resource')
});
} else if ($mmaModResource.isDisplayedInline(module)) {
var downloadFailed = false;
$mmaModResource.downloadAllContent(module).catch(function(err) {
return $mmaModResource.downloadAllContent(module).catch(function(err) {
// Mark download as failed but go on since the main files could have been downloaded.
downloadFailed = true;
}).finally(function() {
Expand All @@ -97,14 +97,14 @@ angular.module('mm.addons.mod_resource')
$scope.mode = 'external';

$scope.open = function() {
var modal = $mmUtil.showModalLoading('mm.core.downloading', true);
var modal = $mmUtil.showModalLoading();

$mmaModResource.openFile(module.contents, module.id).then(function() {
$mmaModResource.logView(module.instance).then(function() {
$mmCourse.checkModuleCompletion(courseid, module.completionstatus);
});
}).catch(function(error) {
if (error) {
if (error && typeof error == 'string') {
$mmUtil.showErrorModal(error);
} else {
$mmUtil.showErrorModal('mma.mod_resource.errorwhileloadingthecontent', true);
Expand Down
9 changes: 7 additions & 2 deletions www/addons/mod_resource/services/resource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,12 +374,17 @@ angular.module('mm.addons.mod_resource')
return $q.reject();
}

var url = contents[0].fileurl,
var files = [contents[0]],
siteId = $mmSite.getId(),
revision = $mmFilepool.getRevisionFromFileList(files),
timeMod = $mmFilepool.getTimemodifiedFromFileList(files),
promise;

if ($mmFS.isAvailable()) {
// The file system is available.
promise = $mmFilepool.downloadUrl($mmSite.getId(), url, false, mmaModResourceComponent, moduleId);
promise = $mmFilepool.downloadPackage(siteId, files, mmaModResourceComponent, moduleId, revision, timeMod).then(function() {
return $mmFilepool.getUrlByUrl(siteId, contents[0].fileurl, mmaModResourceComponent, moduleId, timeMod);
});
} else {
// We use the live URL.
promise = $q.when($mmSite.fixPluginfileURL(url));
Expand Down
25 changes: 24 additions & 1 deletion www/core/lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,30 @@ angular.module('mm.core')
*/
self.showErrorModal = function(errorMessage, needsTranslate, autocloseTime) {
var errorKey = 'mm.core.error',
langKeys = [errorKey];
langKeys = [errorKey],
matches;

if (angular.isObject(errorMessage)) {
// We received an object instead of a string. Search for common properties.
if (typeof errorMessage.content != 'undefined') {
errorMessage = errorMessage.content;
} else if (typeof errorMessage.body != 'undefined') {
errorMessage = errorMessage.body;
} else if (typeof errorMessage.message != 'undefined') {
errorMessage = errorMessage.message;
} else if (typeof errorMessage.error != 'undefined') {
errorMessage = errorMessage.error;
} else {
// No common properties found, just stringify it.
errorMessage = JSON.stringify(errorMessage);
}

// Try to remove tokens from the contents.
matches = errorMessage.match(/token"?[=|:]"?(\w*)/, '');
if (matches && matches[1]) {
errorMessage = errorMessage.replace(new RegExp(matches[1], 'g'), 'secret');
}
}

if (needsTranslate) {
langKeys.push(errorMessage);
Expand Down