From 923bf999e88c5aa524b7a3078c8e721a06c82fd8 Mon Sep 17 00:00:00 2001 From: Albert Gasset Date: Wed, 22 May 2019 15:48:42 +0200 Subject: [PATCH 1/2] MOBILE-2856 data: Fix apply offline actions --- src/addon/mod/data/providers/fields-delegate.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/addon/mod/data/providers/fields-delegate.ts b/src/addon/mod/data/providers/fields-delegate.ts index 43f2895c5..544d9f349 100644 --- a/src/addon/mod/data/providers/fields-delegate.ts +++ b/src/addon/mod/data/providers/fields-delegate.ts @@ -212,11 +212,13 @@ export class AddonModDataFieldsDelegate extends CoreDelegate { * @return {any} Data overriden */ overrideData(field: any, originalContent: any, offlineContent: any, offlineFiles?: any): any { + originalContent = originalContent || {}; + if (!offlineContent) { return originalContent; } - return this.executeFunctionOnEnabled(field.type, 'overrideData', [originalContent || {}, offlineContent, offlineFiles]); + return this.executeFunctionOnEnabled(field.type, 'overrideData', [originalContent, offlineContent, offlineFiles]); } } From 70db7f3eec3d6fc7dc7b445f100c928d77f8cd66 Mon Sep 17 00:00:00 2001 From: Albert Gasset Date: Wed, 22 May 2019 16:06:54 +0200 Subject: [PATCH 2/2] MOBILE-2856 data: Remove duplicate string --- src/addon/mod/data/lang/en.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/addon/mod/data/lang/en.json b/src/addon/mod/data/lang/en.json index 036cc21e4..f358c48a8 100644 --- a/src/addon/mod/data/lang/en.json +++ b/src/addon/mod/data/lang/en.json @@ -34,7 +34,6 @@ "recorddisapproved": "Entry unapproved", "resetsettings": "Reset filters", "search": "Search", - "single": "View single", "selectedrequired": "All selected required", "single": "View single", "timeadded": "Time added",