Remove 'description' from newsletter templates, it's not used anymore
[MAILPOET-2647]
This commit is contained in:
@ -13,7 +13,6 @@ class NewsletterTemplatesResponseBuilder {
|
|||||||
'categories' => $template->getCategories(),
|
'categories' => $template->getCategories(),
|
||||||
'thumbnail' => $template->getThumbnail(),
|
'thumbnail' => $template->getThumbnail(),
|
||||||
'name' => $template->getName(),
|
'name' => $template->getName(),
|
||||||
'description' => $template->getDescription(),
|
|
||||||
'readonly' => $template->getReadonly(),
|
'readonly' => $template->getReadonly(),
|
||||||
'body' => $template->getBody(),
|
'body' => $template->getBody(),
|
||||||
'created_at' => $template->getCreatedAt()->format(self::DATE_FORMAT),
|
'created_at' => $template->getCreatedAt()->format(self::DATE_FORMAT),
|
||||||
@ -34,7 +33,6 @@ class NewsletterTemplatesResponseBuilder {
|
|||||||
'categories' => $template->getCategories(),
|
'categories' => $template->getCategories(),
|
||||||
'thumbnail' => $template->getThumbnail(),
|
'thumbnail' => $template->getThumbnail(),
|
||||||
'name' => $template->getName(),
|
'name' => $template->getName(),
|
||||||
'description' => $template->getDescription(),
|
|
||||||
'readonly' => $template->getReadonly(),
|
'readonly' => $template->getReadonly(),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -36,12 +36,6 @@ class NewsletterTemplateEntity {
|
|||||||
*/
|
*/
|
||||||
private $categories = '[]';
|
private $categories = '[]';
|
||||||
|
|
||||||
/**
|
|
||||||
* @ORM\Column(type="string")
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
private $description = '';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\Column(type="json")
|
* @ORM\Column(type="json")
|
||||||
* @Assert\NotBlank()
|
* @Assert\NotBlank()
|
||||||
@ -91,14 +85,6 @@ class NewsletterTemplateEntity {
|
|||||||
$this->categories = $categories;
|
$this->categories = $categories;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDescription(): string {
|
|
||||||
return $this->description;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function setDescription(string $description) {
|
|
||||||
$this->description = $description;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array|null
|
* @return array|null
|
||||||
*/
|
*/
|
||||||
|
@ -14,6 +14,8 @@ use MailPoet\Entities\NewsletterTemplateEntity;
|
|||||||
* @method void remove(NewsletterTemplateEntity $entity)
|
* @method void remove(NewsletterTemplateEntity $entity)
|
||||||
*/
|
*/
|
||||||
class NewsletterTemplatesRepository extends Repository {
|
class NewsletterTemplatesRepository extends Repository {
|
||||||
|
const RECENTLY_SENT_CATEGORIES = '["recent"]';
|
||||||
|
|
||||||
protected function getEntityClassName() {
|
protected function getEntityClassName() {
|
||||||
return NewsletterTemplateEntity::class;
|
return NewsletterTemplateEntity::class;
|
||||||
}
|
}
|
||||||
@ -23,7 +25,7 @@ class NewsletterTemplatesRepository extends Repository {
|
|||||||
*/
|
*/
|
||||||
public function findAllForListing(): array {
|
public function findAllForListing(): array {
|
||||||
return $this->doctrineRepository->createQueryBuilder('nt')
|
return $this->doctrineRepository->createQueryBuilder('nt')
|
||||||
->select('PARTIAL nt.{id,categories,thumbnail,name,description,readonly}')
|
->select('PARTIAL nt.{id,categories,thumbnail,name,readonly}')
|
||||||
->addOrderBy('nt.readonly', 'ASC')
|
->addOrderBy('nt.readonly', 'ASC')
|
||||||
->addOrderBy('nt.createdAt', 'DESC')
|
->addOrderBy('nt.createdAt', 'DESC')
|
||||||
->addOrderBy('nt.id', 'DESC')
|
->addOrderBy('nt.id', 'DESC')
|
||||||
|
@ -119,7 +119,6 @@ class ManageWelcomeEmailCest {
|
|||||||
$i->click($saveTemplateOption);
|
$i->click($saveTemplateOption);
|
||||||
$i->waitForElement($saveTemplateButton);
|
$i->waitForElement($saveTemplateButton);
|
||||||
$i->fillField('template_name', $templateTitle);
|
$i->fillField('template_name', $templateTitle);
|
||||||
$i->fillField('template_description', $templateDescr);
|
|
||||||
$i->click($saveTemplateButton);
|
$i->click($saveTemplateButton);
|
||||||
$i->waitForText('Template has been saved.');
|
$i->waitForText('Template has been saved.');
|
||||||
$i->amOnMailpoetPage('Emails');
|
$i->amOnMailpoetPage('Emails');
|
||||||
|
@ -24,7 +24,6 @@ class SaveNewsletterAsTemplateCest {
|
|||||||
$i->click('[data-automation-id="newsletter_save_options_toggle"]');
|
$i->click('[data-automation-id="newsletter_save_options_toggle"]');
|
||||||
$i->click('[data-automation-id="newsletter_save_as_template_option"]');
|
$i->click('[data-automation-id="newsletter_save_as_template_option"]');
|
||||||
$i->fillField(['name' => 'template_name'], $templateName);
|
$i->fillField(['name' => 'template_name'], $templateName);
|
||||||
$i->fillField(['name' => 'template_description'], $templateDescription);
|
|
||||||
$i->click('[data-automation-id="newsletter_save_as_template_button"]');
|
$i->click('[data-automation-id="newsletter_save_as_template_button"]');
|
||||||
$i->waitForText('Template has been saved');
|
$i->waitForText('Template has been saved');
|
||||||
|
|
||||||
|
@ -30,7 +30,6 @@ class SavePostNotificationEmailAsTemplateCest {
|
|||||||
$i->click($saveTemplateOption);
|
$i->click($saveTemplateOption);
|
||||||
$i->waitForElement($saveTemplateButton);
|
$i->waitForElement($saveTemplateButton);
|
||||||
$i->fillField('template_name', $templateTitle);
|
$i->fillField('template_name', $templateTitle);
|
||||||
$i->fillField('template_description', $templateDescr);
|
|
||||||
$i->click($saveTemplateButton);
|
$i->click($saveTemplateButton);
|
||||||
$i->waitForText('Template has been saved.');
|
$i->waitForText('Template has been saved.');
|
||||||
|
|
||||||
|
@ -39,7 +39,6 @@
|
|||||||
<div class="mailpoet_save_as_template_container mailpoet_hidden">
|
<div class="mailpoet_save_as_template_container mailpoet_hidden">
|
||||||
<p><b class="mailpoet_save_as_template_title"><%= __('Save as template') %></b></p>
|
<p><b class="mailpoet_save_as_template_title"><%= __('Save as template') %></b></p>
|
||||||
<p><input type="text" name="template_name" value="" placeholder="<%= __('Insert template name') %>" class="mailpoet_input mailpoet_save_as_template_name" /></p>
|
<p><input type="text" name="template_name" value="" placeholder="<%= __('Insert template name') %>" class="mailpoet_input mailpoet_save_as_template_name" /></p>
|
||||||
<p><input type="text" name="template_description" value="" placeholder="<%= __('Insert template description') %>" class="mailpoet_input mailpoet_save_as_template_description" /></p>
|
|
||||||
<p><input type="button" name="save_as_template" value="<%= __('Save as template') %>" class="button button-primary mailpoet_button_full mailpoet_save_as_template" data-automation-id="newsletter_save_as_template_button" /></p>
|
<p><input type="button" name="save_as_template" value="<%= __('Save as template') %>" class="button button-primary mailpoet_button_full mailpoet_save_as_template" data-automation-id="newsletter_save_as_template_button" /></p>
|
||||||
</div>
|
</div>
|
||||||
<div class="mailpoet_export_template_container mailpoet_hidden">
|
<div class="mailpoet_export_template_container mailpoet_hidden">
|
||||||
|
Reference in New Issue
Block a user