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

Merge pull request #1929 from albertgasset/MOBILE-2856 

Mobile 2856
main
Juan Leyva 2019-05-22 17:36:22 +02:00 committed by GitHub
parent 99774954a4 70db7f3eec
commit c62237e1db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/addon/mod/data/lang/en.json
View File

@ -34,7 +34,6 @@
"recorddisapproved": "Entry unapproved", "recorddisapproved": "Entry unapproved",
"resetsettings": "Reset filters", "resetsettings": "Reset filters",
"search": "Search", "search": "Search",
"single": "View single",
"selectedrequired": "All selected required", "selectedrequired": "All selected required",
"single": "View single", "single": "View single",
"timeadded": "Time added", "timeadded": "Time added",

4
src/addon/mod/data/providers/fields-delegate.ts
View File

@ -212,11 +212,13 @@ export class AddonModDataFieldsDelegate extends CoreDelegate {
* @return {any} Data overriden * @return {any} Data overriden
*/ */
overrideData(field: any, originalContent: any, offlineContent: any, offlineFiles?: any): any { overrideData(field: any, originalContent: any, offlineContent: any, offlineFiles?: any): any {
originalContent = originalContent || {};
if (!offlineContent) { if (!offlineContent) {
return originalContent; return originalContent;
} }
return this.executeFunctionOnEnabled(field.type, 'overrideData', [originalContent || {}, offlineContent, offlineFiles]); return this.executeFunctionOnEnabled(field.type, 'overrideData', [originalContent, offlineContent, offlineFiles]);
} }
} }