bug 886331 - preserve version selection

smillaedler · Jun 24, 2013 · 7172f0c · 7172f0c
1 parent 5393199
commit 7172f0c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/crashstats/crashstats/static/crashstats/js/socorro/nav.js b/crashstats/crashstats/static/crashstats/js/socorro/nav.js
@@ -32,8 +32,17 @@ $(document).ready(function () {
     // Used to handle the selection of a specific report.
     if ($("#report_select")) {
         $("#report_select").change(function () {
+            product_version = $("#product_version_select").val();
             report = $("#report_select").val();
-            window.location = report;
+            product = $("#products_select").val();
+            if (product_version === 'Current Versions') {
+                window.location = report;
+            } else if (report.indexOf('/daily') === 0) {
+                // FIXME this report uses a different URL structure
+                window.location =  report + '&v=' + product_version;
+            } else {
+                window.location = report + '/versions/' + product_version;
+            }
         });
     }
 });
diff --git a/crashstats/crashstats/views.py b/crashstats/crashstats/views.py
@@ -392,6 +392,9 @@ def daily(request, default_context=None):
     else:
         return http.HttpResponseBadRequest(str(form.errors))
 
+    if len(params['versions']) > 0:
+        context['version'] = params['versions'][0]
+
     context['form_selection'] = form_selection
     context['product'] = params['product']
 
@@ -708,6 +711,8 @@ def topchangers(request, product=None, versions=None,
     context['days'] = days
     context['possible_days'] = possible_days
     context['versions'] = versions
+    if len(versions) == 1:
+        context['version'] = versions[0]
 
     context['product_versions'] = []
     for version in versions: