diff --git a/src/app/folder/controllers/FolderController.php b/src/app/folder/controllers/FolderController.php index 653df9a7bf21634e02d622eb0798f3eab8d92f3f..191f0066fc455bda6cf72357eb1b718c041bec92 100755 --- a/src/app/folder/controllers/FolderController.php +++ b/src/app/folder/controllers/FolderController.php @@ -882,10 +882,10 @@ class FolderController } $baskets = BasketModel::getWithPreferences([ - 'select' => ['baskets.id', 'baskets.basket_name', 'baskets.basket_clause', 'users_baskets_preferences.group_serial_id', 'usergroups.group_desc'], - 'where' => ['users_baskets_preferences.user_serial_id = ?'], - 'data' => [$GLOBALS['id']], - 'orderBy' => ['baskets.id'] + 'select' => ['baskets.id', 'baskets.basket_name', 'baskets.basket_clause', 'users_baskets_preferences.group_serial_id', 'usergroups.group_desc'], + 'where' => ['users_baskets_preferences.user_serial_id = ?'], + 'data' => [$GLOBALS['id']], + 'orderBy' => ['baskets.basket_name'] ]); $groupsBaskets = []; $inCheckedBaskets = []; diff --git a/src/app/group/controllers/GroupController.php b/src/app/group/controllers/GroupController.php index d6f83cba8edd1619acf8b6eeceb3b763097e04e8..ab480c18d0e0c1948ab343d7be392604cc534f31 100755 --- a/src/app/group/controllers/GroupController.php +++ b/src/app/group/controllers/GroupController.php @@ -356,45 +356,4 @@ class GroupController return $groupsClause; } - - /** - * @codeCoverageIgnore - */ - public static function arraySort($aArgs) - { - ValidatorModel::notEmpty($aArgs, ['data', 'on']); - ValidatorModel::arrayType($aArgs, ['data']); - ValidatorModel::stringType($aArgs, ['on']); - - $order = SORT_ASC; - $sortableArray = []; - - foreach ($aArgs['data'] as $k => $v) { - if (is_array($v)) { - foreach ($v as $k2 => $v2) { - if ($k2 == $aArgs['on']) { - $sortableArray[$k] = $v2; - } - } - } else { - $sortableArray[$k] = $v; - } - } - - switch ($order) { - case SORT_ASC: - asort($sortableArray); - break; - case SORT_DESC: - arsort($sortableArray); - break; - } - - $newArray = []; - foreach ($sortableArray as $k => $v) { - $newArray[] = $aArgs['data'][$k]; - } - - return $newArray; - } } diff --git a/src/app/resource/controllers/UserFollowedResourceController.php b/src/app/resource/controllers/UserFollowedResourceController.php index cb020e3c6b31bad091547fc74c3ae645e5e1dee2..4beb38e6e6aac88bd87d63f81d199e0402904f6f 100644 --- a/src/app/resource/controllers/UserFollowedResourceController.php +++ b/src/app/resource/controllers/UserFollowedResourceController.php @@ -180,7 +180,7 @@ class UserFollowedResourceController 'select' => ['baskets.id', 'baskets.basket_name', 'baskets.basket_clause', 'users_baskets_preferences.group_serial_id', 'usergroups.group_desc'], 'where' => ['users_baskets_preferences.user_serial_id = ?'], 'data' => [$GLOBALS['id']], - 'orderBy' => ['baskets.id'] + 'orderBy' => ['baskets.basket_name'] ]); $groupsBaskets = []; $inCheckedBaskets = []; diff --git a/test/unitTests/app/folder/FolderControllerTest.php b/test/unitTests/app/folder/FolderControllerTest.php index 928169dce4bdcf51ed5ff8cf0161324eda9e0ef6..5bd1b98c87aab2161b0cc45b5360198275ad7c90 100755 --- a/test/unitTests/app/folder/FolderControllerTest.php +++ b/test/unitTests/app/folder/FolderControllerTest.php @@ -995,14 +995,14 @@ class FolderControllerTest extends TestCase $this->assertSame(2, $responseBody['groupsBaskets'][0]['groupId']); $this->assertSame('Utilisateur', $responseBody['groupsBaskets'][0]['groupName']); - $this->assertSame(4, $responseBody['groupsBaskets'][0]['basketId']); - $this->assertSame('Courriers à traiter', $responseBody['groupsBaskets'][0]['basketName']); + $this->assertSame(6, $responseBody['groupsBaskets'][0]['basketId']); + $this->assertSame('AR en masse : non envoyés', $responseBody['groupsBaskets'][0]['basketName']); $this->assertSame(2, $responseBody['groupsBaskets'][1]['groupId']); $this->assertSame('Utilisateur', $responseBody['groupsBaskets'][1]['groupName']); - $this->assertSame(6, $responseBody['groupsBaskets'][1]['basketId']); - $this->assertSame('AR en masse : non envoyés', $responseBody['groupsBaskets'][1]['basketName']); + $this->assertSame(4, $responseBody['groupsBaskets'][1]['basketId']); + $this->assertSame('Courriers à traiter', $responseBody['groupsBaskets'][1]['basketName']); $GLOBALS['userId'] = 'superadmin'; $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]); diff --git a/test/unitTests/app/resource/UserFollowedResourceControllerTest.php b/test/unitTests/app/resource/UserFollowedResourceControllerTest.php index 3812b84a1ed64fa0552a365b32e52f28e5bdd395..25612754081d5d2f044754bb45f81d06ce1d8cc9 100644 --- a/test/unitTests/app/resource/UserFollowedResourceControllerTest.php +++ b/test/unitTests/app/resource/UserFollowedResourceControllerTest.php @@ -348,13 +348,13 @@ class UserFollowedResourceControllerTest extends TestCase $this->assertSame(2, $responseBody['groupsBaskets'][0]['groupId']); $this->assertSame('Utilisateur', $responseBody['groupsBaskets'][0]['groupName']); - $this->assertSame(4, $responseBody['groupsBaskets'][0]['basketId']); - $this->assertSame('Courriers à traiter', $responseBody['groupsBaskets'][0]['basketName']); + $this->assertSame(6, $responseBody['groupsBaskets'][0]['basketId']); + $this->assertSame('AR en masse : non envoyés', $responseBody['groupsBaskets'][0]['basketName']); $this->assertSame(2, $responseBody['groupsBaskets'][1]['groupId']); $this->assertSame('Utilisateur', $responseBody['groupsBaskets'][1]['groupName']); - $this->assertSame(6, $responseBody['groupsBaskets'][1]['basketId']); - $this->assertSame('AR en masse : non envoyés', $responseBody['groupsBaskets'][1]['basketName']); + $this->assertSame(4, $responseBody['groupsBaskets'][1]['basketId']); + $this->assertSame('Courriers à traiter', $responseBody['groupsBaskets'][1]['basketName']); $GLOBALS['userId'] = 'bblier'; $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);