EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3320 scorm: Fix file downloaded when it shouldn't

main
Dani Palou 2021-05-26 09:28:22 +02:00
parent 1ac0b7a0f4
commit 997d6185fd
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/addons/mod/scorm/services/handlers/prefetch.ts
View File

@ -15,7 +15,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { CoreError } from '@classes/errors/error'; import { CoreError } from '@classes/errors/error';
import { CoreCourseActivityPrefetchHandlerBase } from '@features/course/classes/activity-prefetch-handler'; import { CoreCourseActivityPrefetchHandlerBase } from '@features/course/classes/activity-prefetch-handler';
import { CoreCourseAnyModuleData, CoreCourseCommonModWSOptions } from '@features/course/services/course'; import { CoreCourse, CoreCourseAnyModuleData, CoreCourseCommonModWSOptions } from '@features/course/services/course';
import { CoreApp } from '@services/app'; import { CoreApp } from '@services/app';
import { CoreFile } from '@services/file'; import { CoreFile } from '@services/file';
import { CoreFilepool } from '@services/filepool'; import { CoreFilepool } from '@services/filepool';
@ -316,8 +316,13 @@ export class AddonModScormPrefetchHandlerService extends CoreCourseActivityPrefe
* @param siteId Site ID. * @param siteId Site ID.
* @returns Promise resolved with the SCORM. * @returns Promise resolved with the SCORM.
*/ */
protected getScorm(module: CoreCourseAnyModuleData, courseId: number, siteId?: string): Promise<AddonModScormScorm> { protected async getScorm(module: CoreCourseAnyModuleData, courseId: number, siteId?: string): Promise<AddonModScormScorm> {
const moduleUrl = 'url' in module ? module.url : undefined; let moduleUrl = 'url' in module ? module.url : undefined;
if (!moduleUrl) {
module = await CoreCourse.getModule(module.id, module.course, undefined, true, false, siteId);
moduleUrl = module.url;
}
return AddonModScorm.getScorm(courseId, module.id, { moduleUrl, siteId }); return AddonModScorm.getScorm(courseId, module.id, { moduleUrl, siteId });
} }

2
src/addons/mod/scorm/services/scorm-sync.ts
View File

@ -198,7 +198,7 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
if (updated) { if (updated) {
try { try {
// Update downloaded data. // Update downloaded data.
const module = await CoreCourse.getModuleBasicInfoByInstance(scorm.id, 'scorm', siteId); const module = await CoreCourse.getModule(scorm.coursemodule, scorm.course, undefined, false, false, siteId);
await this.prefetchAfterUpdate(AddonModScormPrefetchHandler.instance, module, scorm.course, undefined, siteId); await this.prefetchAfterUpdate(AddonModScormPrefetchHandler.instance, module, scorm.course, undefined, siteId);
} catch { } catch {