Additional fix for #660

Fix for #662
This commit is contained in:
Tomas Bures 2019-08-11 21:01:01 +02:00
parent 8cb24feca1
commit 23e683192f
4 changed files with 7 additions and 5 deletions

View file

@ -72,7 +72,7 @@ class PreviewForTestUserModalDialog extends Component {
}); });
const accessToken = result.data; const accessToken = result.data;
window.open(getSandboxUrl(`campaigns/rss-preview/${campaignCid}/${listCid}/${subscriptionCid}`, accessToken, {withLocale: true}), '_blank'); window.open(getSandboxUrl(`cpgs/rss-preview/${campaignCid}/${listCid}/${subscriptionCid}`, accessToken, {withLocale: true}), '_blank');
} else if (entity.type === CampaignType.REGULAR) { } else if (entity.type === CampaignType.REGULAR) {
window.open(getPublicUrl(`archive/${campaignCid}/${listCid}/${subscriptionCid}`, {withLocale: true}), '_blank'); window.open(getPublicUrl(`archive/${campaignCid}/${listCid}/${subscriptionCid}`, {withLocale: true}), '_blank');

View file

@ -157,7 +157,7 @@
"campaign_plural": "Campaigns", "campaign_plural": "Campaigns",
"contentOfTheSelectedCampaignWillBeCopied": "Content of the selected campaign will be copied into this campaign.", "contentOfTheSelectedCampaignWillBeCopied": "Content of the selected campaign will be copied into this campaign.",
"renderUrl": "Render URL", "renderUrl": "Render URL",
"ifAMessageIsSentThenThisUrlWillBePosTed": "If a message is sent then this URL will be POSTed to using Merge Tags as POST body. Use this if you want to generate the HTML message yourself.", "ifAMessageIsSentThenThisUrlWillBePosTed": "If a message is sent then this URL will be POSTed to using Merge Tags as POST body. Use this if you want to generate the HTML message yourself. Example: http://www.example.com/foo",
"deletingCampaign": "Deleting campaign ...", "deletingCampaign": "Deleting campaign ...",
"campaignDeleted": "Campaign deleted", "campaignDeleted": "Campaign deleted",
"formCannotBeEditedBecauseTheCampaignIs": "Form cannot be edited because the campaign is currently being sent out. Wait till the sending is finished and refresh.", "formCannotBeEditedBecauseTheCampaignIs": "Form cannot be edited because the campaign is currently being sent out. Wait till the sending is finished and refresh.",

View file

@ -275,7 +275,7 @@ async function createApp(appType) {
useWith404Fallback('/files', files); useWith404Fallback('/files', files);
} }
useWith404Fallback('/campaigns', await campaigns.getRouter(appType)); useWith404Fallback('/cpgs', await campaigns.getRouter(appType)); // This needs to be different from "campaigns", which is already used by the UI
useWith404Fallback('/mosaico', await sandboxedMosaico.getRouter(appType)); useWith404Fallback('/mosaico', await sandboxedMosaico.getRouter(appType));
useWith404Fallback('/ckeditor', await sandboxedCKEditor.getRouter(appType)); useWith404Fallback('/ckeditor', await sandboxedCKEditor.getRouter(appType));

View file

@ -200,14 +200,16 @@ class MessageSender {
form[key] = mergeTags[key]; form[key] = mergeTags[key];
} }
const sourceUrl = campaign.data.sourceUrl;
const response = await request.post({ const response = await request.post({
uri: campaign.sourceUrl, uri: sourceUrl,
form, form,
resolveWithFullResponse: true resolveWithFullResponse: true
}); });
if (response.statusCode !== 200) { if (response.statusCode !== 200) {
throw new Error(`Received status code ${httpResponse.statusCode} from ${campaign.sourceUrl}`); throw new Error(`Received status code ${httpResponse.statusCode} from ${sourceUrl}`);
} }
html = response.body; html = response.body;