From 2a1179cdadd499d817398fe79651211f4af83530 Mon Sep 17 00:00:00 2001 From: Alfonso Salces Date: Mon, 15 May 2023 10:35:05 +0200 Subject: [PATCH] MOBILE-4247 data-helper: Add field name and description to view --- src/addons/mod/data/services/data-helper.ts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/addons/mod/data/services/data-helper.ts b/src/addons/mod/data/services/data-helper.ts index 901416dc2..8227bd512 100644 --- a/src/addons/mod/data/services/data-helper.ts +++ b/src/addons/mod/data/services/data-helper.ts @@ -214,13 +214,28 @@ export class AddonModDataHelperProvider { fields.forEach((field) => { let replace = '[[' + field.name + ']]'; replace = replace.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&'); - const replaceRegex = new RegExp(replace, 'gi'); + let replaceRegex = new RegExp(replace, 'gi'); // Replace field by a generic directive. const render = '' + ''; + template = template.replace(replaceRegex, render); + + // Replace the field name tag. + replace = '[[' + field.name + '#name]]'; + replace = replace.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&'); + replaceRegex = new RegExp(replace, 'gi'); + + template = template.replace(replaceRegex, field.name); + + // Replace the field description tag. + replace = '[[' + field.name + '#description]]'; + replace = replace.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&'); + replaceRegex = new RegExp(replace, 'gi'); + + template = template.replace(replaceRegex, field.description); }); for (const action in actions) {