Correction rendu du sélecteur de données du kiosque en mode non popup + ajout titre de popup

application/modules/admin/controllers/ModulesController.php

@@ -33,8 +33,12 @@ class Admin_ModulesController extends ZendAfi_Controller_Action {
 
 	public function init() {
 		parent::init();
-		$this->render = $this->getHelper('ViewRenderer');
-		$this->render->setLayoutScript('subModal.phtml');
+
+		if ($this->_request->getActionName()!='kiosque-change-data') {
+			$this->render = $this->getHelper('ViewRenderer');
+			$this->render->setLayoutScript('subModal.phtml');
+		}
+
 		$this->initParams();
 		if(array_key_exists('type_module',$this->_request->getParams()))
 			$this->initViewParams();
@@ -361,25 +365,16 @@ class Admin_ModulesController extends ZendAfi_Controller_Action {
 		$module_config = $this->profil->getModuleAccueilConfig($this->_getParam('id_module'));
 		$this->view->id_panier = $module_config['preferences']['id_panier'];
 		$this->view->id_catalogue = $module_config['preferences']['id_catalogue'];
+		$this->view->titre = $this->view->_('Sélectionnez un panier ou un domaine');
 
-		if($this->_request->isPost()) {
-			$enreg = $this->_request->getPost();
-			$this->updateCfg($enreg);
-			$this->_request->setParam('render','');
-/*			$url_reload = $this->view->absoluteUrl(['controller' => 'modules-accueil',
-				'action' => 'render-module',
-				'id' => $this->id_module],null,true);
-			
-				return $this->renderPopupResult('',"<script>$('.boite.kiosque').reload('".$url_reload."');opacDialogClose();setTimeout(initializePopups(),100);</script>");*/
-			$this->_redirect($this->_getReferer());
+		if (!$this->_request->isPost())
 			return;
-		}
 
-		/*	Class_ScriptLoader::getInstance()->addInlineScript("initializeAjaxFormSubmit($('input[type=\"submit\"][name=\"kiosque-change-data\"]').closest('form'))");
+		$enreg = $this->_request->getPost();
+		$this->updateCfg($enreg);
+		$this->_request->setParam('render','');
 
-				$this->renderPopupResult($this->view->_('Selectionner le kiosque ou le panier à afficher dans le kiosque'),
-				$this->view->render('kiosque-change-data.phtml').
-				Class_ScriptLoader::getInstance()->html());*/
+		$this->_redirect($this->_getReferer());
 	}
 
 

tests/application/modules/admin/controllers/ModulesControllerTest.php

@@ -248,7 +248,7 @@ class ModulesControllerChangeKiosqueSelectionPostSaveIdPanierTest extends Admin_
 
 
 
-class ModulesControllerChangeKiosqueSelectionPostSaveIdCatalogueTest extends Admin_AbstractControllerTestCase {
+abstract class ModulesControllerChangeKiosqueSelectionTestCase extends Admin_AbstractControllerTestCase {
 	public function setUp() {
 		parent::setUp();
 
@@ -264,6 +264,31 @@ class ModulesControllerChangeKiosqueSelectionPostSaveIdCatalogueTest extends Adm
 																	 'division' => 4,
 																	 'id_module' => 3,
 																	 'preferences' => ['id_panier' => 555]]);
+	}
+}
+
+
+
+class ModulesControllerChangeKiosqueSelectionDataActionTest extends ModulesControllerChangeKiosqueSelectionTestCase{
+	public function setUp() {
+		parent::setUp();
+
+		$this->dispatch('/admin/modules/kiosque-change-data/id_module/3');
+	}
+
+
+	/** @test */
+	public function titleShouldSelectionnerUnPanierOuDomainePourKiosque() {
+		$this->assertXPathContentContains('//title', 'Sélectionnez un panier ou un domaine', $this->_response->getBody());
+	}
+}
+
+
+
+
+class ModulesControllerChangeKiosqueSelectionPostSaveIdCatalogueTest extends ModulesControllerChangeKiosqueSelectionTestCase{
+	public function setUp() {
+		parent::setUp();
 
 		$this->postDispatch('/admin/modules/kiosque-change-data/id_module/3', 
 												['id_catalogue' => 5,
@@ -287,23 +312,11 @@ class ModulesControllerChangeKiosqueSelectionPostSaveIdCatalogueTest extends Adm
 
 
 
-class ModulesControllerChangeKiosqueSelectionPostSaveNullPanierTest extends Admin_AbstractControllerTestCase {
+
+class ModulesControllerChangeKiosqueSelectionPostSaveNullPanierTest extends ModulesControllerChangeKiosqueSelectionTestCase {
 	public function setUp() {
 		parent::setUp();
 
-		$_SERVER['HTTP_REFERER'] = 'opac/index';
-
-		Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Profil')
-			->whenCalled('save')
-			->answers(true);
-
-		Class_Profil::getCurrentProfil()
-			->updateModuleConfigAccueil(3,
-																	['type_module' => 'KIOSQUE',
-																	 'division' => 4,
-																	 'id_module' => 3,
-																	 'preferences' => ['id_panier' => 555]]);
-
 		$this->postDispatch('/admin/modules/kiosque-change-data/id_module/3', 
 												['id_panier' => 0,
 													'id_catalogue' => 0]);