Skip to content
Snippets Groups Projects
Commit c19bf338 authored by Alex Arnaud's avatar Alex Arnaud
Browse files

Dev #32511 - Add draft element in newsletter form

parent 74c62917
Branches
Tags
7 merge requests!1553Master,!1502Master,!1501Stable,!1281Dev#32614 une newsletter dupliquee doit etre automatiquement mise en brouillon hackest,!1260Dev#32614 une newsletter dupliquee doit etre automatiquement mise en brouillon hackest,!1257Dev#32511 hide newsletter,!1240Dev#32511 hide newsletter
......@@ -254,6 +254,10 @@ class Admin_NewsletterController extends ZendAfi_Controller_Action {
->setAttrib('size', 30)
->addValidator(new Zend_Validate_EmailAddress());
$draft = $form
->createElement('checkbox', 'draft')
->setLabel('Brouillon ?');
$contenu = $form
->createElement('ckeditor', 'contenu')
->setRequired(true);
......@@ -285,9 +289,10 @@ class Admin_NewsletterController extends ZendAfi_Controller_Action {
$form
->addElement($titre)
->addElement($expediteur)
->addElement($draft)
->addElement('checkbox', 'auto_subscribe', ['label' => "Inscrire automatiquement les nouveaux lecteurs à la lettre d'information"])
->addElement($contenu)
->addDisplayGroup(array('titre', 'expediteur'),
->addDisplayGroup(array('titre', 'expediteur', 'draft'),
'letter',
array("legend" => "Lettre"))
->addDisplayGroup(['auto_subscribe'],
......
......@@ -341,6 +341,10 @@ class Admin_NewsletterControllerEditActionTest extends Admin_NewsletterControlle
$this->assertXPath("//form//input[@id='expediteur'][@value='laurent@free.fr']");
}
public function testFormDraft() {
$this->assertXPath('//form//input[@id="draft"][@value="1"]');
}
public function testFormContenuHTML() {
$this->assertQueryContentContains("form textarea[@name='contenu'][following-sibling::script]",
'Notre sélection du mois');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment