Skip to content

Commit 34a1aee

Browse files
committed
MOBILE-1412 resource: Update package status when opening file
1 parent 428c112 commit 34a1aee

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

www/addons/mod_resource/controllers/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ angular.module('mm.addons.mod_resource')
7171
});
7272
} else if ($mmaModResource.isDisplayedInline(module)) {
7373
var downloadFailed = false;
74-
$mmaModResource.downloadAllContent(module).catch(function(err) {
74+
return $mmaModResource.downloadAllContent(module).catch(function(err) {
7575
// Mark download as failed but go on since the main files could have been downloaded.
7676
downloadFailed = true;
7777
}).finally(function() {
@@ -97,7 +97,7 @@ angular.module('mm.addons.mod_resource')
9797
$scope.mode = 'external';
9898

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

102102
$mmaModResource.openFile(module.contents, module.id).then(function() {
103103
$mmaModResource.logView(module.instance).then(function() {

www/addons/mod_resource/services/resource.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,12 +374,17 @@ angular.module('mm.addons.mod_resource')
374374
return $q.reject();
375375
}
376376

377-
var url = contents[0].fileurl,
377+
var files = [contents[0]],
378+
siteId = $mmSite.getId(),
379+
revision = $mmFilepool.getRevisionFromFileList(files),
380+
timeMod = $mmFilepool.getTimemodifiedFromFileList(files),
378381
promise;
379382

380383
if ($mmFS.isAvailable()) {
381384
// The file system is available.
382-
promise = $mmFilepool.downloadUrl($mmSite.getId(), url, false, mmaModResourceComponent, moduleId);
385+
promise = $mmFilepool.downloadPackage(siteId, files, mmaModResourceComponent, moduleId, revision, timeMod).then(function() {
386+
return $mmFilepool.getUrlByUrl(siteId, contents[0].fileurl, mmaModResourceComponent, moduleId, timeMod);
387+
});
383388
} else {
384389
// We use the live URL.
385390
promise = $q.when($mmSite.fixPluginfileURL(url));

0 commit comments

Comments
 (0)