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

Merge pull request #2992 from dpalou/MOBILE-3918 

MOBILE-3918 h5p: Fix undefined title for some packages
main
Pau Ferrer Ocaña 2021-11-12 13:10:38 +01:00 committed by GitHub
parent da6e3e8a20 1906a62080
commit 3d784427cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/features/h5p/classes/framework.ts
View File

@ -483,6 +483,10 @@ export class CoreH5PFramework {
if (!params.metadata) {
params.metadata = {};
}
// Add title to metadata.
if (typeof params.title === 'string' && !params.metadata.title) {
params.metadata.title = params.title;
}
content.metadata = params.metadata;
content.params = JSON.stringify(typeof params.params != 'undefined' && params.params != null ? params.params : params);
@ -834,6 +838,14 @@ export class CoreH5PFramework {
content.library.libraryId = mainLibrary.id;
}
// Add title to 'params' to be able to add it to metadata later.
if (typeof content.title === 'string') {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const params = CoreTextUtils.parseJSON<any>(content.params || '{}');
params.title = content.title;
content.params = JSON.stringify(params);
}
const data: Partial<CoreH5PContentDBRecord> = {
id: undefined,
jsoncontent: content.params,
@ -844,23 +856,26 @@ export class CoreH5PFramework {
fileurl: fileUrl,
timecreated: undefined,
};
let contentId: number | undefined;
if (typeof content.id != 'undefined') {
data.id = content.id;
contentId = content.id;
} else {
data.timecreated = data.timemodified;
}
await db.insertRecord(CONTENT_TABLE_NAME, data);
if (!data.id) {
if (!contentId) {
// New content. Get its ID.
const entry = await db.getRecord<CoreH5PContentDBRecord>(CONTENT_TABLE_NAME, data);
content.id = entry.id;
contentId = content.id;
}
return content.id!;
return contentId;
}
/**

6
src/core/features/h5p/classes/storage.ts
View File

@ -173,6 +173,11 @@ export class CoreH5PStorage {
const content: CoreH5PContentBeingSaved = {};
// Add the 'title' if exists from 'h5p.json' data to be able to add it to metadata later.
if (typeof data.mainJsonData.title === 'string') {
content.title = data.mainJsonData.title;
}
if (!skipContent) {
// Find main library version.
if (data.mainJsonData.preloadedDependencies) {
@ -226,6 +231,7 @@ export type CoreH5PContentBeingSaved = {
id?: number;
params?: string;
library?: CoreH5PContentLibrary;
title?: string;
};
export type CoreH5PContentLibrary = CoreH5PLibraryBasicData & {