From af5be4468a60427c7fce316663ce084d63db7b05 Mon Sep 17 00:00:00 2001
From: gloas <gloas@git-test.afi-sa.fr>
Date: Mon, 2 Dec 2013 09:08:40 +0000
Subject: [PATCH] refacto class_profil getBoitesDivision
---
library/Class/Profil.php | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/library/Class/Profil.php b/library/Class/Profil.php
index 135b8c2b091..7f0334d8e2d 100644
--- a/library/Class/Profil.php
+++ b/library/Class/Profil.php
@@ -1113,15 +1113,15 @@ class Class_Profil extends Storm_Model_Abstract {
*/
public function getBoitesDivision($division) {
if ($division == self::DIV_BANNIERE and $this->hasParentProfil())
- $cfg_accueil = $this->getParentProfil()->getCfgAccueilAsArray();
- else if ($division == '5')
- $cfg_accueil = $this->getCfgDivisionFiveAsArray();
- else
- $cfg_accueil = $this->getCfgAccueilAsArray();
+ return $this->getParentProfil()->getBoitesDivision($division);
- return $this->_filterCfgAccueilByDivision($cfg_accueil, $division);
+ if ($division == '5' && Class_AdminVar::isBoitePanierAutoEnabled())
+ $this->setBoitePanierInDivisionFive();
+
+ return $this->_filterCfgAccueilByDivision($this->getCfgAccueilAsArray(), $division);
}
+
protected function _filterCfgAccueilByDivision($cfg_accueil, $division) {
$boites = array();
@@ -1147,14 +1147,6 @@ class Class_Profil extends Storm_Model_Abstract {
}
- protected function getCfgDivisionFiveAsArray() {
- if(Class_AdminVar::isBoitePanierAutoEnabled())
- $this->setBoitePanierInDivisionFive();
-
- return $this->getCfgAccueilAsArray();
- }
-
-
protected function setBoitePanierInDivisionFive() {
return $this->setBoiteOfTypeInDivision(5, 'PANIER');
}
--
GitLab