dev #75882 fix thesauri order on rules

library/Class/ListViewModeDescription/Thesauri.php

@@ -41,14 +41,8 @@ class Class_ListViewModeDescription_Thesauri {
 
                'model' => $this->_getModel(),
                'search_columns' => $this->_getSearchColumns(),
-               'categories_description' => function($description, $list_view_mode)
-      {
-        return $this->_describeCategoriesIn($description, $list_view_mode);
-      },
-               'items_description' => function($description, $list_view_mode)
-      {
-        return $this->_describeItemsIn($description, $list_view_mode);
-      }];
+               'categories_description' => [$this, 'describeCategoriesIn'],
+               'items_description' => [$this, 'describeItemsIn']];
 
     return $helper->treeCodificationListViewMode($params);
   }
@@ -70,30 +64,25 @@ class Class_ListViewModeDescription_Thesauri {
   }
 
 
-  protected function _describeCategoriesIn($description, $list_view_mode) {
+  public function describeCategoriesIn($description, $list_view_mode) {
     return $description
       ->addColumn($this->_('Thesaurus'), ['attribute' => 'libelle',
-                                          'callback' => function($model, $attrib) use ($list_view_mode)
-                                          {
-                                            return $list_view_mode->renderCategory($model, $attrib);
-                                          }])
+                                          'callback' => $list_view_mode->renderCategoryClosure()])
       ->addColumn($this->_('Libellé facette'), 'libelle_facette')
       ->addColumn($this->_('Code facette'), 'facette_index')
       ->addColumn($this->_('Règle'), 'rules_label');
   }
 
 
-  protected function _describeItemsIn($description, $list_view_mode) {
+  public function describeItemsIn($description, $list_view_mode) {
     return $description
       ->addColumn($this->_('Thesaurus'), ['attribute' => 'libelle',
-                                          'callback' => function($model, $attrib) use ($list_view_mode)
-                                          {
-                                            return $list_view_mode->renderItem($model, $attrib);
-                                          }])
+                                          'callback' => $list_view_mode->renderItemClosure()])
       ->addColumn($this->_('Libellé facette'), 'libelle_facette')
       ->addColumn($this->_('Code facette'), ['attribute' => 'facette_index',
                                              'sort_attribute' => 'id_thesaurus'])
-      ->addColumn($this->_('Règle'), 'rules_label')
+      ->addColumn($this->_('Règle'), ['attribute' => 'rules_label',
+                                      'sort_attribute' => 'rules'])
       ->setSorterServer()
       ;
   }

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

@@ -89,4 +89,18 @@ class ZendAfi_Controller_Action_Helper_TreeCodificationListViewMode extends Zend
     $callback = $this->getParam('items_description');
     return $callback($description, $this);
   }
+
+
+  public function renderCategoryClosure() {
+    return function($model, $attrib) {
+      return $this->_renderCategory($model, $attrib);
+    };
+  }
+
+
+  public function renderItemClosure() {
+    return function($model, $attrib) {
+      return $this->_renderItem($model, $attrib);
+    };
+  }
 }
\ No newline at end of file

tests/scenarios/Thesauri/ThesauriTest.php

@@ -153,7 +153,7 @@ class ThesauriIndexChildrenSearchTest extends ThesauriTestCase {
   public function searchShouldRedirect() {
     $this->postDispatch('/admin/thesauri/index',
                         ['title_search' => 'Docu']);
-    $this->assertRedirectTo('/admin/thesauri/index/title_search/Docu/page/1/order/libelle');
+    $this->assertRedirectTo('/admin/thesauri/index/title_search/Docu/page/1');
   }