From b4345a5b744458f751337ec1a1cb55802ab76be5 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 7 Sep 2020 20:47:23 +0000 Subject: [PATCH] --- server/AyaNova/biz/ReportBiz.cs | 4 +++- server/AyaNova/resource/rpt/ay-report.js | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/server/AyaNova/biz/ReportBiz.cs b/server/AyaNova/biz/ReportBiz.cs index f81cd42a..d7e60506 100644 --- a/server/AyaNova/biz/ReportBiz.cs +++ b/server/AyaNova/biz/ReportBiz.cs @@ -69,6 +69,8 @@ namespace AyaNova.Biz return null; } Report newObject = new Report(); + + CopyObject.Copy(dbObject, newObject); string newUniqueName = string.Empty; bool NotUnique = true; long l = 1; @@ -407,7 +409,7 @@ namespace AyaNova.Biz #endif //compile and run handlebars template - var compileScript = $"Handlebars.compile(`{report.Template}`)({{ ayReportData:ayPreRender({ReportData}), ayClientMetaData:{clientMeta} }});"; + var compileScript = $"Handlebars.compile(`{report.Template}`)({{ ayReportData:ayPreRender({ReportData}), ayClientMetaData:{clientMeta}, ayApiUrl:{apiUrl} }});"; var resultHTML = await page.EvaluateExpressionAsync(compileScript); //render report as HTML diff --git a/server/AyaNova/resource/rpt/ay-report.js b/server/AyaNova/resource/rpt/ay-report.js index 7eba1ec7..c05d9df3 100644 --- a/server/AyaNova/resource/rpt/ay-report.js +++ b/server/AyaNova/resource/rpt/ay-report.js @@ -10,6 +10,13 @@ function ayRegisterHelpers() { Handlebars.registerHelper("ayJSON", function (obj) { return JSON.stringify(obj, null, 3); }); + + Handlebars.registerHelper("link", function(text, url) { + var url = Handlebars.escapeExpression(url), + text = Handlebars.escapeExpression(text) + + return new Handlebars.SafeString("" + text +""); +}); } function ayPreRender(theReportData) {