Merge pull request #324 from AdrianGaudebert/850988-products-order

Fixes bug 850988 - Corrected the order of products in dropdowns.
mozilla · Apr 19, 2013 · 2b17e50 · 2b17e50
2 parents b71a70e + fdc1c54
commit 2b17e50
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/crashstats/crashstats/models.py b/crashstats/crashstats/models.py
@@ -270,11 +270,12 @@ def clean(string):
 class CurrentVersions(SocorroMiddleware):
 
     def get(self):
-        products = CurrentProducts().get()['hits']
+        products = CurrentProducts().get()['products']
+        releases = CurrentProducts().get()['hits']
         currentversions = []
 
         for product_name in products:
-            for release in products[product_name]:
+            for release in releases[product_name]:
                 currentversions.append(release)
 
         return currentversions

diff --git a/crashstats/crashstats/tests/test_models.py b/crashstats/crashstats/tests/test_models.py
@@ -106,7 +106,8 @@ def mocked_get(**options):
                      "version": "2.1.3pre",
                      "release": "Beta",
                      "id": 922}]
-                  }
+                  },
+                  "products": ["Camino"]
                 }
               """)
 
@@ -134,7 +135,8 @@ def mocked_get(**options):
                      "version": "2.1.3pre",
                      "release": "Beta",
                      "id": 922}]
-                  }
+                  },
+                  "products": ["WaterWolf"]
                 }
             """)
 
@@ -884,7 +886,8 @@ def mocked_get(**options):
                      "version": "2.1.3pre",
                      "release": "Beta",
                      "id": 922}]
-                  }
+                  },
+                  "products": ["Camino"]
                 }
               """)
         rget.side_effect = mocked_get