From 2cfd072739834ef40e055af69e1308b3886ceda6 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 19 Sep 2019 17:42:29 +0200
Subject: [PATCH] Basket: sort table, form element

---
 application/forms/AddToBasketForm.php      | 10 +++++-----
 library/Director/Web/Table/BasketTable.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/forms/AddToBasketForm.php b/application/forms/AddToBasketForm.php
index 28b151e5..9e57c770 100644
--- a/application/forms/AddToBasketForm.php
+++ b/application/forms/AddToBasketForm.php
@@ -23,11 +23,11 @@ class AddToBasketForm extends DirectorForm
      */
     public function setup()
     {
-        $baskets = Basket::loadAll($this->getDb());
-        $enum = [];
-        foreach ($baskets as $basket) {
-            $enum[$basket->get('basket_name')] = $basket->get('basket_name');
-        }
+        $db = $this->getDb()->getDbAdapter();
+        $enum = $db->fetchPairs($db->select()->from('director_basket', [
+            'a' => 'basket_name',
+            'b' => 'basket_name',
+        ])->order('basket_name'));
 
         $names = [];
         $basket = null;
diff --git a/library/Director/Web/Table/BasketTable.php b/library/Director/Web/Table/BasketTable.php
index 022fb480..25e37e02 100644
--- a/library/Director/Web/Table/BasketTable.php
+++ b/library/Director/Web/Table/BasketTable.php
@@ -45,6 +45,6 @@ class BasketTable extends ZfQueryBasedTable
             ['bs' => 'director_basket_snapshot'],
             'bs.basket_uuid = b.uuid',
             []
-        )->group('b.uuid');
+        )->group('b.uuid')->order('b.basket_name');
     }
 }