Skip to content

moqui / moqui-mjml

Go to a project
Toggle navigation
Toggle navigation pinning
01241fe4 by Michael Jones
Options

Merge branch 'BF-11979' into 'master' 

Make json in CDATA, add error for no dataRaw from file

See merge request !4
2 parents 262b7086 376dd503
Expand all
Inline Side-by-side
Showing 2 changed files with 1 additions and 0 deletions
...@@ -62,6 +62,7 @@ along with this software (see the LICENSE.md file). If not, see ...@@ -62,6 +62,7 @@ along with this software (see the LICENSE.md file). If not, see
62 <service-call name="mjml.MjmlServices.get#GlobalGrapeVarList" out-map="context"/> 62 <service-call name="mjml.MjmlServices.get#GlobalGrapeVarList" out-map="context"/>
63 <set field="defaultLocation" value="dbresource://grapesjs/template/default.json"/> 63 <set field="defaultLocation" value="dbresource://grapesjs/template/default.json"/>
64 <set field="dataRaw" from="ec.resource.getLocationReference(defaultLocation).getText()"/> 64 <set field="dataRaw" from="ec.resource.getLocationReference(defaultLocation).getText()"/>
65 <if condition="!dataRaw"><log level="error" message="Template not found at ${defaultLocation}. Please load seed data for moqui-mjml."/></if>
65 <set field="htmlLocation" from="grapesJsResource.location + '/' + htmlFile?.dbResourceId + '.html'"/> 66 <set field="htmlLocation" from="grapesJsResource.location + '/' + htmlFile?.dbResourceId + '.html'"/>
66 <set field="grapesLocation" from="grapesJsResource.location + '/' + grapesFile?.dbResourceId + '.json'"/> 67 <set field="grapesLocation" from="grapesJsResource.location + '/' + grapesFile?.dbResourceId + '.json'"/>
67 <script><![CDATA[ 68 <script><![CDATA[
......