Fixes bug 1269240 - Display pretty platform version in report/index. (m…

…ozilla-services#3318)
mbrukman · May 3, 2016 · 6772ef6 · 6772ef6
1 parent adbf80e
commit 6772ef6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/webapp-django/crashstats/crashstats/jinja2/crashstats/report_index.html b/webapp-django/crashstats/crashstats/jinja2/crashstats/report_index.html
@@ -149,7 +149,7 @@ <h2>{{ report.product }} {{ report.version }} Crash Report [@ {{ report.signatur
                             </tr>
                             <tr>
                                 <th scope="row">OS</th>
-                                <td>{{ report.os_name }}</td>
+                                <td>{{ report.os_pretty_version or report.os_name }}</td>
                             </tr>
                             <tr>
                                 <th scope="row">OS Version</th>

diff --git a/webapp-django/crashstats/crashstats/tests/test_views.py b/webapp-django/crashstats/crashstats/tests/test_views.py
@@ -112,6 +112,7 @@
     "addons_checked": null,
     "product": "WaterWolf",
     "os_name": "Mac OS X",
+    "os_pretty_version": "OS X 10.11",
     "last_crash": 371342,
     "date_processed": "2012-06-11T06:08:44",
     "cpu_name": "amd64",
@@ -2420,6 +2421,9 @@ def mocked_get(url, params, **options):
         # should be a link there to crash analysis
         ok_(settings.CRASH_ANALYSIS_URL in response.content)
 
+        # The pretty platform version should appear.
+        ok_('OS X 10.11' in response.content)
+
         # the email address will appear if we log in
         user = self._login()
         group = self._create_group_with_permission('view_pii')