Merge pull request #857 from AdrianGaudebert/794164-products-order

Fixes bug 794164 - Sorted the products list returned from the middleware.
mozilla-services · Oct 5, 2012 · c37d98a · c37d98a
2 parents 50df35a + 3e5ab8a
commit c37d98a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/socorro/external/postgresql/products.py b/socorro/external/postgresql/products.py
@@ -112,7 +112,12 @@ def _get_versions(self, params):
     def _get_products(self):
         """ Return a list of product names """
 
-        sql_query = "SELECT * FROM products"
+        sql_query = """
+            /* socorro.external.postgresql.products.Products._get_products */
+            SELECT *
+            FROM products
+            ORDER BY sort
+        """
 
         json_result = {
             "total": 0,

diff --git a/socorro/unittest/external/postgresql/test_products.py b/socorro/unittest/external/postgresql/test_products.py
@@ -209,21 +209,21 @@ def test_get(self):
                         "sort": 1,
                         "default_version": "8.0",
                         "rapid_release_version": "8.0"
-                     },
-                    {
-                        "product_name": "Fennec",
-                        "release_name": "mobile",
-                        "sort": 3,
-                        "default_version": "11.0.1",
-                        "rapid_release_version": "11.0"
-                     },
+                    },
                     {
                         "product_name": "Thunderbird",
                         "release_name": "thunderbird",
                         "sort": 2,
                         "default_version": "10.0.2b",
                         "rapid_release_version": "10.0"
-                     }
+                    },
+                    {
+                        "product_name": "Fennec",
+                        "release_name": "mobile",
+                        "sort": 3,
+                        "default_version": "11.0.1",
+                        "rapid_release_version": "11.0"
+                    }
                 ],
                 "total": 3
         }