dev #75882 fix albumListViewMode

application/modules/admin/controllers/AlbumController.php

@@ -204,6 +204,7 @@ class Admin_AlbumController extends ZendAfi_Controller_Action {
     $this->view->list = $this->_helper
       ->albumListViewMode(['model' => $category,
                            'page' => $this->_getParam('page', 0),
+                           'order' => $this->_getParam('order', 'titre'),
                            'search_value' => $this->_getParam('title_search', '')]);
 
     return $this->renderScript('admin/listViewMode.phtml');

library/ZendAfi/Controller/Action/Helper/AlbumListViewMode.php

@@ -33,6 +33,27 @@ class ZendAfi_Controller_Action_Helper_AlbumListViewMode extends ZendAfi_Control
   }
 
 
+  protected function _describeCategoriesIn($description) {
+    return $description
+      ->addColumn($this->_('Catégories d\'albums'), ['attribute' => 'libelle',
+                                                     'callback' => function($model, $attrib)
+                                                     {
+                                                       return $this->_renderCategory($model, $attrib);
+                                                     }]);
+  }
+
+
+  protected function _describeItemsIn($description) {
+    return $description
+      ->setSorterServer()
+      ->addColumn($this->_('Liste des albums'), ['attribute' => 'titre',
+                                                 'callback' => function($model, $attrib)
+                                                 {
+                                                   return $this->_renderItem($model, $attrib);
+                                                 }]);
+  }
+
+
   public function getBaseUrl() {
     return ['module' => 'admin',
             'controller' => 'album'];
@@ -60,12 +81,8 @@ class ZendAfi_Controller_Action_Helper_AlbumListViewMode extends ZendAfi_Control
 
 
   public function getItems() {
-    return Class_Album::findAllBy($this->getItemsParams());
-  }
-
-
-  public function getItemsParams() {
-    return array_merge(parent::getItemsParams(), ['order' => 'titre']);
+    return Class_Album::findAllBy(array_merge($this->getItemsParams(),
+                                              ['order' => $this->getOrder()]));
   }
 
 
@@ -118,26 +135,6 @@ class ZendAfi_Controller_Action_Helper_AlbumListViewMode extends ZendAfi_Control
   }
 
 
-  public function getCategoriesCols() {
-    return [$this->_('Catégories d\'albums')];
-  }
-
-
-  public function getCategoriesLabelAttrib() {
-    return 'libelle';
-  }
-
-
-  public function getItemsCols($view) {
-    return [$this->_('Liste des albums')];
-  }
-
-
-  public function getItemsLabelAttrib() {
-    return 'titre';
-  }
-
-
   public function getStrategyLabel() {
     return 'album';
   }

library/ZendAfi/Controller/Action/Helper/AuthorListViewMode.php

@@ -86,29 +86,12 @@ class ZendAfi_Controller_Action_Helper_AuthorListViewMode extends ZendAfi_Contro
   }
 
 
-  public function getItemsAttribs() {
-    return ['libelle',
-            'facet_code'];
-  }
-
-
   public function getSearchColumns() {
     return ['libelle',
             'id_auteur'];
   }
 
 
-  public function getItemsCols($view) {
-    $cols = [];
-
-    foreach(['libelle' =>  $this->_('Nom prénom'),
-             'id_auteur' => $this->_('Code Facette')] as $key => $value)
-      $cols [] = $this->_withOrder($view, $key, $value);
-
-    return $cols;
-  }
-
-
   protected function enabledSorter() {
     return false;
   }

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

@@ -354,3 +354,20 @@ class Admin_AlbumControllerListViewModeSearchSpecialCharTest extends Admin_Album
     $this->assertXPath('//div[@class="actions"]//a[contains(@href,"admin/album/edit_album/title_search/%C3%A9/id/2")]', $this->_response->getBody());
   }
 }
+
+
+
+
+class AlbumControllerListModeEditOrderTest extends Admin_AlbumControllerListViewModeTestCase {
+
+  public function setUp() {
+    parent::setUp();
+    $this->dispatch('/admin/album/index/cat_id/4/order/titre+desc', true);
+  }
+
+
+  /** @test */
+  public function listeAlbumHeaderShouldBeOrderTitre() {
+    $this->assertXpathContentContains('//table//a[@href="/admin/album/index/cat_id/4/order/titre"]', 'Liste des albums');
+  }
+}
\ No newline at end of file