diff --git a/VERSIONS_HOTLINE/47596 b/VERSIONS_HOTLINE/47596 new file mode 100644 index 0000000000000000000000000000000000000000..250602f7919de6b5ae80805bd88719746edc7fcf --- /dev/null +++ b/VERSIONS_HOTLINE/47596 @@ -0,0 +1 @@ + - ticket #47596 : Administration : correction de la validation des paramètres de la boîte formation. \ No newline at end of file diff --git a/application/modules/admin/views/scripts/accueil/formations-widget.phtml b/application/modules/admin/views/scripts/accueil/formations-widget.phtml index 17e1c4377602afa0a1eb4fca73d1af04bad3be75..5dc149a9912fba7a72c1d86a58de81663609cf46 100644 --- a/application/modules/admin/views/scripts/accueil/formations-widget.phtml +++ b/application/modules/admin/views/scripts/accueil/formations-widget.phtml @@ -1,3 +1,5 @@ -<?php -echo ZendAfi_Form_Configuration_FormationsWidget::newWith($this->module_settings); +<?php +$form = ZendAfi_Form_Configuration_FormationsWidget::newWith($this->module_settings); +$form->setAction($this->url); +echo $this->renderForm($form); ?> diff --git a/library/ZendAfi/Form/Configuration/FormationsWidget.php b/library/ZendAfi/Form/Configuration/FormationsWidget.php index 76d96544227169f30987a2026be6e27a5ef49a09..82661689736ce715a53852b20615e06061605134 100644 --- a/library/ZendAfi/Form/Configuration/FormationsWidget.php +++ b/library/ZendAfi/Form/Configuration/FormationsWidget.php @@ -40,10 +40,6 @@ class ZendAfi_Form_Configuration_FormationsWidget extends ZendAfi_Form { 'display_group_mode', 'display_mode'], 'advanced', - ['legend' => '']) - - ->addDisplayGroup(['submit'], - 'submit', ['legend' => '']); return $form; } @@ -93,11 +89,7 @@ class ZendAfi_Form_Configuration_FormationsWidget extends ZendAfi_Form { 'multiOptions' => [ Class_Systeme_ModulesAccueil_Formations::DISPLAY_NO_GROUP => $this->_('non groupé'), Class_Systeme_ModulesAccueil_Formations::DISPLAY_GROUP_BY_YEAR =>$this->_('groupé par année') - ]]) - - ->addElement('submit', - 'submit', - ['label' => $this->_('Valider')]); + ]]); } diff --git a/tests/application/modules/admin/controllers/AccueilControllerFormationsTest.php b/tests/application/modules/admin/controllers/AccueilControllerFormationsTest.php index 2c2ba5e3815c7dc7f1d29e4f783fc292e91ff52d..d0333b352bab925c44442f65489f670fd1a68e3e 100644 --- a/tests/application/modules/admin/controllers/AccueilControllerFormationsTest.php +++ b/tests/application/modules/admin/controllers/AccueilControllerFormationsTest.php @@ -55,6 +55,12 @@ class Admin_AccueilControllerFormationsTestWithDefaultSettings extends Admin_Abs public function yearCategoriesShouldNotSelectable() { $this->assertXPathContentContains('//script', 'categoriesNotSelectable'); } + + + /** @test */ + public function formActionShouldBeAdminSlahAccueilSlahFormationWidget() { + $this->assertXPath('//form[contains(@action, "/admin/accueil/formations-widget")]'); + } }