Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Uses 'slug' instead of 'id' for newsletter types

Browse Source
This commit is contained in:
Vlad
2018-02-19 19:07:04 -05:00
parent 9eda024b02
commit a9b40802a9
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/src/newsletters/newsletters.jsx
View File

@@ -30,8 +30,8 @@ const getAutomaticEmailsRoutes = () => {
if (!window.mailpoet_automatic_emails) return null; if (!window.mailpoet_automatic_emails) return null;
return _.map(window.mailpoet_automatic_emails, automaticEmail => ({ return _.map(window.mailpoet_automatic_emails, automaticEmail => ({
path: `new/${automaticEmail.id}`, path: `new/${automaticEmail.slug}`,
name: automaticEmail.id, name: automaticEmail.slug,
component: AutomaticEmailsEventsList, component: AutomaticEmailsEventsList,
data: { data: {
automaticEmail: automaticEmail, automaticEmail: automaticEmail,

10
assets/js/src/newsletters/types.jsx
View File

@@ -63,7 +63,7 @@ define(
<div> <div>
<a className="button button-primary" <a className="button button-primary"
disabled={disabled} disabled={disabled}
onClick={!disabled ? this.setupNewsletter.bind(null, automaticEmail.id) : null} onClick={!disabled ? this.setupNewsletter.bind(null, automaticEmail.slug) : null}
> >
{ MailPoet.I18n.t('setUp') } { MailPoet.I18n.t('setUp') }
</a> </a>
@@ -76,7 +76,7 @@ define(
render: function () { render: function () {
const defaultTypes = [ const defaultTypes = [
{ {
id: 'standard', slug: 'standard',
title: MailPoet.I18n.t('regularNewsletterTypeTitle'), title: MailPoet.I18n.t('regularNewsletterTypeTitle'),
description: MailPoet.I18n.t('regularNewsletterTypeDescription'), description: MailPoet.I18n.t('regularNewsletterTypeDescription'),
action: function () { action: function () {
@@ -88,7 +88,7 @@ define(
}.bind(this)(), }.bind(this)(),
}, },
{ {
id: 'welcome', slug: 'welcome',
title: MailPoet.I18n.t('welcomeNewsletterTypeTitle'), title: MailPoet.I18n.t('welcomeNewsletterTypeTitle'),
description: MailPoet.I18n.t('welcomeNewsletterTypeDescription'), description: MailPoet.I18n.t('welcomeNewsletterTypeDescription'),
action: (function () { action: (function () {
@@ -102,7 +102,7 @@ define(
}()), }()),
}, },
{ {
id: 'notification', slug: 'notification',
title: MailPoet.I18n.t('postNotificationNewsletterTypeTitle'), title: MailPoet.I18n.t('postNotificationNewsletterTypeTitle'),
description: MailPoet.I18n.t('postNotificationNewsletterTypeDescription'), description: MailPoet.I18n.t('postNotificationNewsletterTypeDescription'),
action: function () { action: function () {
@@ -125,7 +125,7 @@ define(
<ul className="mailpoet_boxes clearfix"> <ul className="mailpoet_boxes clearfix">
{types.map((type, index) => ( {types.map((type, index) => (
<li key={index} data-type={type.id}> <li key={index} data-type={type.slug}>
<div> <div>
<div className="mailpoet_thumbnail"> <div className="mailpoet_thumbnail">
{type.thumbnailImage ? <img src={type.thumbnailImage} /> : null} {type.thumbnailImage ? <img src={type.thumbnailImage} /> : null}

8
assets/js/src/newsletters/types/automatic_emails/events_list.jsx
View File

@@ -11,8 +11,8 @@ class AutomaticEmailsEventsList extends React.Component {
this.eventsConfigurator = this.eventsConfigurator.bind(this); this.eventsConfigurator = this.eventsConfigurator.bind(this);
} }
eventsConfigurator(eventId) { eventsConfigurator(eventSlug) {
this.props.router.push(`new/${this.automaticEmail.id}/${eventId}/conditions`); this.props.router.push(`new/${this.automaticEmail.slug}/${eventSlug}/conditions`);
} }
displayEvents() { displayEvents() {
@@ -32,7 +32,7 @@ class AutomaticEmailsEventsList extends React.Component {
action = ( action = (
<a className="button button-primary" <a className="button button-primary"
disabled={disabled} disabled={disabled}
onClick={!disabled ? this.eventsConfigurator.bind(null, event.id) : null} onClick={!disabled ? this.eventsConfigurator.bind(null, event.slug) : null}
> >
{event.actionButtonTitle || MailPoet.I18n.t('setUp')} {event.actionButtonTitle || MailPoet.I18n.t('setUp')}
</a> </a>
@@ -40,7 +40,7 @@ class AutomaticEmailsEventsList extends React.Component {
} }
return ( return (
<li key={index} data-type={event.id}> <li key={index} data-type={event.slug}>
<div> <div>
<div className="mailpoet_thumbnail"> <div className="mailpoet_thumbnail">
{event.thumbnailImage ? <img src={event.thumbnailImage} /> : null} {event.thumbnailImage ? <img src={event.thumbnailImage} /> : null}