From e70a9f3d4a9ee074f405c821a75e64490d3a79e2 Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Fri, 2 May 2014 11:52:02 +0200
Subject: [PATCH] dev #13296 revert updateEtRetour
---
.../admin/controllers/AccueilController.php | 18 ++++++++----------
.../AccueilControllerFormationsTest.php | 2 +-
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/application/modules/admin/controllers/AccueilController.php b/application/modules/admin/controllers/AccueilController.php
index f17ac689d90..27792abc7b3 100644
--- a/application/modules/admin/controllers/AccueilController.php
+++ b/application/modules/admin/controllers/AccueilController.php
@@ -425,17 +425,15 @@ class Admin_AccueilController extends Zend_Controller_Action {
if ($this->config == "admin") {
$this->view->id_module = $this->id_module;
$this->view->properties = $this->_compactProperties($enreg);
- }
-
-
- $module_config = $this->profil->getModuleAccueilConfig($this->id_module);
- $module_config['preferences'] = $enreg;
- $this->profil
- ->updateModuleConfigAccueil($this->id_module, $module_config)
- ->save();
-
- $this->view->reload = 'SITE';
+ }else {
+ $module_config = $this->profil->getModuleAccueilConfig($this->id_module);
+ $module_config['preferences'] = $enreg;
+ $this->profil
+ ->updateModuleConfigAccueil($this->id_module, $module_config)
+ ->save();
+ $this->view->reload = 'SITE';
+ }
$viewRenderer = $this->getHelper('ViewRenderer');
$viewRenderer->renderScript('accueil/_retour.phtml');
diff --git a/tests/application/modules/admin/controllers/AccueilControllerFormationsTest.php b/tests/application/modules/admin/controllers/AccueilControllerFormationsTest.php
index aed0b47fe88..50bf63f113c 100644
--- a/tests/application/modules/admin/controllers/AccueilControllerFormationsTest.php
+++ b/tests/application/modules/admin/controllers/AccueilControllerFormationsTest.php
@@ -65,7 +65,7 @@ class Admin_AccueilControllerFormationsPostTest extends Admin_AbstractController
'id_module' => 1])
->beCurrentProfil();
- $this->postDispatch('admin/accueil/formations-widget?config=admin&id_profil=1&id_module=1&type_module=FORMATIONS_WIDGET',
+ $this->postDispatch('admin/accueil/formations-widget?config=accueil&id_profil=1&id_module=1&type_module=FORMATIONS_WIDGET',
['selected_formations' => '1;2']);
}
--
GitLab