diff --git a/VERSIONS_HOTLINE/43916 b/VERSIONS_HOTLINE/43916 new file mode 100644 index 0000000000000000000000000000000000000000..c5a4bcec00272bb18e6cff5b3f2c6bbf268e4ebd --- /dev/null +++ b/VERSIONS_HOTLINE/43916 @@ -0,0 +1 @@ + - ticket #43916 : Les favoris du compte lecteur sont affichés par ordre alphabétique \ No newline at end of file diff --git a/library/Class/Catalogue.php b/library/Class/Catalogue.php index ad292dcf5cbd27964c4eb89ea6e59e331069989f..1f65618d84956f99efa3656abdb8e382cd52ab66 100644 --- a/library/Class/Catalogue.php +++ b/library/Class/Catalogue.php @@ -42,7 +42,8 @@ class CatalogueLoader extends Storm_Model_Loader { public function findAllCataloguesAIndexer() { - return Class_Catalogue::findAllBy(['indexer'=>true]); + return Class_Catalogue::findAllBy(['indexer' => true, + 'order' => 'libelle']); } @@ -1224,12 +1225,6 @@ class Class_Catalogue extends Storm_Model_Abstract { public function getViewableDomainJson() { $domains = Class_Catalogue::getLoader()->findAllCataloguesAIndexer(); - usort($domains, - function($a, $b) - { - return $a->getLibelle() > $b->getLibelle(); - }); - $data_domains = array_map( function($d) { $datas = $d->toDataForJsonWithCategoriesItems([], []); @@ -1238,6 +1233,12 @@ class Class_Catalogue extends Storm_Model_Abstract { }, $domains); + usort($data_domains, + function($a, $b) + { + return $a['label'] > $b['label']; + }); + return $data = ['id' => 'domains', 'label' => $this->_('Domaines'), 'categories' => $data_domains, diff --git a/tests/application/modules/opac/controllers/AbonneControllerSettingsTest.php b/tests/application/modules/opac/controllers/AbonneControllerSettingsTest.php index 14e98e319f24d3deb68a8c2b24f117b47bc47c8b..79b88ca6933b467d3fad08637769368358a077d4 100644 --- a/tests/application/modules/opac/controllers/AbonneControllerSettingsTest.php +++ b/tests/application/modules/opac/controllers/AbonneControllerSettingsTest.php @@ -56,6 +56,14 @@ abstract class AbonneControllerSettingsTestCase extends AbstractControllerTestCa 'indexer' => '1']) ]]); + $this->_cinema = $this->fixture('Class_Catalogue', + ['id' => 8, + 'libelle' => 'Danse', + 'sous_domaines' => [ $this->fixture('Class_Catalogue', + ['id' => 81, + 'libelle' => 'Kizomba', + 'indexer' => '1'])]]); + $this->_user->setBookmarkedDomains([3]); } } @@ -119,6 +127,7 @@ class AbonneControllerViewableDomainTest extends AbonneControllerSettingsTestCas ['id' => 3, 'label' => 'Cinema', 'categories' => [], 'items' => [], 'options' => ['ico' => $icon]], ['id' => 32, 'label' => 'Cinema / Couleurs', 'categories' => [], 'items' => [], 'options' => ['ico' => $icon]], ['id' => 31, 'label' => 'Cinema / Muet', 'categories' => [], 'items' => [], 'options' => ['ico' => $icon]], + ['id' => 81, 'label' => 'Danse / Kizomba', 'categories' => [], 'items' => [], 'options' => ['ico' => $icon]], ['id' => 1, 'label' => 'Music', 'categories' => [], 'items' => [], 'options' => ['ico' => $icon]], ['id' => 2, 'label' => 'Sport', 'categories' => [], 'items' => [], 'options' => ['ico' => $icon]], ],