diff --git a/.template-lintrc.js b/.template-lintrc.js index 44cb37a9a..59d6e9283 100644 --- a/.template-lintrc.js +++ b/.template-lintrc.js @@ -3,7 +3,7 @@ module.exports = { rules: { 'no-forbidden-elements': ['meta', 'html', 'script'], - 'no-implicit-this': {allow: ['now', 'site-icon-style', 'accent-color-background']}, + 'no-implicit-this': {allow: ['noop', 'now', 'site-icon-style', 'accent-color-background']}, 'no-inline-styles': false } }; diff --git a/app/components/gh-publishmenu-scheduled.hbs b/app/components/gh-publishmenu-scheduled.hbs index 1dde13f0e..66583d6af 100644 --- a/app/components/gh-publishmenu-scheduled.hbs +++ b/app/components/gh-publishmenu-scheduled.hbs @@ -38,6 +38,24 @@
+ {{#if (and (feature "multipleNewsletters") (gt @availableNewsletters.length 1))}} +
+ + {{newsletter.name}} + +
+ {{/if}} +
n.id === this.args.post.newsletterId); + } + constructor() { super(...arguments); this.minDate = new Date(); diff --git a/app/components/gh-publishmenu.hbs b/app/components/gh-publishmenu.hbs index 06f33d9a3..d582c5e0f 100644 --- a/app/components/gh-publishmenu.hbs +++ b/app/components/gh-publishmenu.hbs @@ -26,6 +26,7 @@ @setTypedDateError={{action (mut this.typedDateError)}} @isSendingEmailLimited={{this.isSendingEmailLimited}} @sendingEmailLimitError={{this.sendingEmailLimitError}} + @availableNewsletters={{this.availableNewsletters}} data-test-publishmenu-scheduled="true" /> {{else}} diff --git a/app/models/post.js b/app/models/post.js index 230777eed..20a47217c 100644 --- a/app/models/post.js +++ b/app/models/post.js @@ -111,6 +111,9 @@ export default Model.extend(Comparable, ValidationEngine, { featureImageAlt: attr('string'), featureImageCaption: attr('string'), + // TODO: delete when newsletter relationship/embed is fully defined + newsletterId: attr(), + authors: hasMany('user', {embedded: 'always', async: false}), createdBy: belongsTo('user', {async: true}), email: belongsTo('email', {async: false}),