Skip to content
Snippets Groups Projects
Commit 82b3fb18 authored by Ghislain Loas's avatar Ghislain Loas
Browse files

hotline #47728 fix RT comment

parent 0ca0507e
4 merge requests!1837Master,!1836Hotline master,!1835Stable,!1832hotline #47728 fix lostpass page settings
......@@ -102,7 +102,7 @@ class Admin_ModulesController extends ZendAfi_Controller_Action {
public function authLostPassAction() {
$form = ZendAfi_Form_Configuration_AuthLostPass::newConfigurationWith($this->preferences);
$form = ZendAfi_Form_Configuration_AuthLostPass::newWith($this->preferences);
$form->setAction($this->view->url(['controller' => 'modules',
'action' => 'auth-lost-pass',
'render' => 'popup']));
......
......@@ -22,13 +22,6 @@
class ZendAfi_Form_Configuration_AuthLostPass extends ZendAfi_Form {
public static function newConfigurationWith($conf) {
$form = new static();
$form->populate($conf);
return $form;
}
public function init() {
parent::init();
......@@ -56,35 +49,4 @@ class ZendAfi_Form_Configuration_AuthLostPass extends ZendAfi_Form {
;
}
public function populate(array $datas) {
parent::populate($datas);
if (!array_key_exists('fields', $datas))
return $this;
foreach(explode(';', $datas['fields']) as $field) {
$parts = explode(':', $field);
if ($element = $this->getElement($parts[0]))
$element->setValue($parts[1]);
}
return $this;
}
protected function _optionalFieldOptions() {
return ['' => $this->_('Non affiché'),
'optional' => $this->_('Affiché et facultatif'),
'required' => $this->_('Affiché et obligatoire')];
}
public function getValues() {
$values = parent::getValues();
$values['fields'] = 'library:' . $values['library'] . ';card_number:' . $values['card_number'];
unset($values['library'], $values['card_number']);
return $values;
}
}
\ No newline at end of file
......@@ -413,6 +413,22 @@ class ModulesControllerRegisterConfigTest extends Admin_AbstractControllerTestCa
class ModulesControllerAuthLostPassTest extends Admin_AbstractControllerTestCase {
protected $_storm_default_to_volatile = true;
public function setUp() {
parent::setUp();
$this->dispatch('/admin/modules/auth?config=site&type_module=auth&id_profil=1&action1=lostpass&action2=', true);
}
/** @test */
public function formShouldContainsStyleDeBoite() {
$this->assertXPathContentContains('//form//label', 'Style de boite');
}
}
class ModulesControllerBibIndexTest extends Admin_AbstractControllerTestCase {
protected $_storm_default_to_volatile = true;
......
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