Mise au point du contrôleur Galerie/index

[zf2.biz/galerie.git] / module / Galerie / src / Galerie / Controller / IndexController.php

diff --git a/module/Galerie/src/Galerie/Controller/IndexController.php b/module/Galerie/src/Galerie/Controller/IndexController.php
index de82f92..2f28c98 100644 (file)
--- a/module/Galerie/src/Galerie/Controller/IndexController.php
+++ b/module/Galerie/src/Galerie/Controller/IndexController.php
@@ -8,45 +8,33 @@ use Zend\View\Model\ViewModel;
 class IndexController extends AbstractActionController 
 {
 
-    private $_galerieArrayTable;
-    private $_galerieATable;
+    private $_galerieTable;
+    private $_galerieInfoTable;
 
-    private function _getGalerieArrayTable()
-    {
-        if (!$this->_galerieArrayTable) {
-            $sm = $this->getServiceLocator();
-            $this->_galerieArrayTable = $sm->get('Galerie\Model\GalerieArrayTable');
-        }
-        return $this->_galerieArrayTable;
-    }
 
-    private function _getGalerieATable()
+    private function _getGalerieTable()
     {
-        if (!$this->_galerieATable) {
+        if (!$this->_galerieTable) {
             $sm = $this->getServiceLocator();
-            $this->_galerieATable = $sm->get('Galerie\Model\GalerieATable');
+            $this->_galerieTable = $sm->get('Galerie\Model\GalerieTable');
         }
-        return $this->_galerieATable;
+        return $this->_galerieTable;
     }
 
-    private function _getGalerieBTable()
+    private function _getGalerieInfoTable()
     {
-        if (!$this->_galerieBTable) {
+        if (!$this->_galerieInfoTable) {
             $sm = $this->getServiceLocator();
-            $this->_galerieBTable = $sm->get('Galerie\Model\GalerieBTable');
+            $this->_galerieInfoTable = $sm->get('Galerie\Model\GalerieInfoTable');
         }
-        return $this->_galerieBTable;
+        return $this->_galerieInfoTable;
     }
 
+
     public function indexAction() 
     { 
         return new ViewModel(array(
-            'GalerieArray_all' => $this->_getGalerieArrayTable()->fetchAll(),
-            'GalerieArray_one' => $this->_getGalerieArrayTable()->getGalerie(1),
-            'GalerieA_all' => $this->_getGalerieATable()->fetchAll(),
-            'GalerieA_one' => $this->_getGalerieATable()->getGalerie(1),
-            'GalerieB_all' => $this->_getGalerieBTable()->fetchAll(),
-            'GalerieB_one' => $this->_getGalerieBTable()->getGalerie(1),
+            'all' => $this->_getGalerieInfoTable()->all(),
         )); 
     }