From 331fd9fef91f29ecb383e61694c6d28f7b1faaf4 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Mon, 28 Jun 2021 13:22:29 +0200 Subject: [PATCH] MOBILE-3320 assign: Fix leave confirm displayed when shouldn't --- .../assign/feedback/comments/component/comments.ts | 2 +- .../mod/assign/feedback/comments/services/handler.ts | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/addons/mod/assign/feedback/comments/component/comments.ts b/src/addons/mod/assign/feedback/comments/component/comments.ts index 371d82140..12cfc7579 100644 --- a/src/addons/mod/assign/feedback/comments/component/comments.ts +++ b/src/addons/mod/assign/feedback/comments/component/comments.ts @@ -93,7 +93,7 @@ export class AddonModAssignFeedbackCommentsComponent extends AddonModAssignFeedb // Update the text and save it as draft. this.isSent = false; - this.text = this.replacePluginfileUrls(text); + this.text = this.replacePluginfileUrls(text || ''); AddonModAssignFeedbackDelegate.saveFeedbackDraft(this.assign.id, this.userId, this.plugin, { text: text, format: 1, diff --git a/src/addons/mod/assign/feedback/comments/services/handler.ts b/src/addons/mod/assign/feedback/comments/services/handler.ts index 0e0a3b4ce..1b288988c 100644 --- a/src/addons/mod/assign/feedback/comments/services/handler.ts +++ b/src/addons/mod/assign/feedback/comments/services/handler.ts @@ -49,13 +49,14 @@ export class AddonModAssignFeedbackCommentsHandlerService implements AddonModAss * @param inputData Data entered in the feedback edit form. * @return Text to submit. */ - getTextFromInputData(plugin: AddonModAssignPlugin, inputData: AddonModAssignFeedbackCommentsTextData): string { + getTextFromInputData(plugin: AddonModAssignPlugin, inputData: AddonModAssignFeedbackCommentsTextData): string | undefined { + if (inputData.assignfeedbackcomments_editor === undefined) { + return undefined; + } + const files = plugin.fileareas && plugin.fileareas[0] ? plugin.fileareas[0].files : []; - // The input data can have a string or an object with text and format. Get the text. - const text = inputData.assignfeedbackcomments_editor || ''; - - return CoreTextUtils.restorePluginfileUrls(text, files || []); + return CoreTextUtils.restorePluginfileUrls(inputData.assignfeedbackcomments_editor, files || []); } /**