From b08fd079091ff4a55c9a9ae3b8d92baca42f6f3b Mon Sep 17 00:00:00 2001 From: root Date: Tue, 6 Aug 2019 09:25:22 +0200 Subject: [PATCH] convertFileURLs fix --- server/lib/campaign-content.js | 4 ++-- server/models/templates.js | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/server/lib/campaign-content.js b/server/lib/campaign-content.js index 965b6bfb..1f6901d8 100644 --- a/server/lib/campaign-content.js +++ b/server/lib/campaign-content.js @@ -1,6 +1,6 @@ 'use strict'; -function convertFileURLs(sourceCustom, fromEntityType, fromEntityId, toEntityType, toEntityId) { +function convertFileURLs(sourceCustom, fromEntityType, fromEntityId, toEntityType, toEntityId, campaign) { function convertText(text) { if (text) { @@ -22,7 +22,7 @@ function convertFileURLs(sourceCustom, fromEntityType, fromEntityId, toEntityTyp sourceCustom.html = convertText(sourceCustom.html); sourceCustom.text = convertText(sourceCustom.text); - if (sourceCustom.type === 'mosaico' || sourceCustom.type === 'mosaicoWithFsTemplate') { + if ((sourceCustom.type === 'mosaico' || sourceCustom.type === 'mosaicoWithFsTemplate') && campaign){ sourceCustom.data.model = convertText(sourceCustom.data.model); sourceCustom.data.model = convertText(sourceCustom.data.model); sourceCustom.data.metadata = convertText(sourceCustom.data.metadata); diff --git a/server/models/templates.js b/server/models/templates.js index 5a278a7d..0f311f77 100644 --- a/server/models/templates.js +++ b/server/models/templates.js @@ -77,7 +77,7 @@ async function create(context, entity) { if (entity.fromExistingEntity) { const existing = await getByIdTx(tx, context, entity.existingEntity, false); - + entity.type = existing.type; entity.tag_language = existing.tag_language; entity.data = existing.data; @@ -92,13 +92,11 @@ async function create(context, entity) { await shares.rebuildPermissionsTx(tx, { entityTypeId: 'template', entityId: id }); - //Returns an error - /*if (entity.fromExistingEntity) { + if (entity.fromExistingEntity) { await files.copyAllTx(tx, context, 'template', 'file', entity.existingEntity, 'template', 'file', id); - - convertFileURLs(entity, 'template', entity.existingEntity, 'template', id); + convertFileURLs(entity, 'template', entity.existingEntity, 'template', id, false); await tx('templates').update(filterObject(entity, allowedKeys)).where('id', id); - }*/ + } return id; });