From 5db6eeb9cf4bf82d785dd193703b46b2139247e5 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Tue, 21 Apr 2015 14:00:18 +0800
Subject: Bug 579089: Change default Hardware / OS values to be
 "Unspecified/Unspecified"

---
 .../template/en/default/guided/guided.html.tmpl           |  2 --
 extensions/GuidedBugEntry/web/js/guided.js                | 15 ++++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'extensions/GuidedBugEntry')

diff --git a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
index c3119810b..47614a636 100644
--- a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
+++ b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
@@ -55,8 +55,6 @@ YAHOO.util.Dom.removeClass('loading', 'hidden');
 <script type="text/javascript">
 YAHOO.util.Dom.addClass('loading', 'hidden');
 guided.init({ webdev: [% webdev ? "true" : "false" %] });
-guided.detectedPlatform = '[% platform FILTER js %]';
-guided.detectedOpSys = '[% op_sys FILTER js %]';
 guided.currentUser = '[% user.login FILTER js %]';
 guided.openStates = [
 [% FOREACH state = open_states %]
diff --git a/extensions/GuidedBugEntry/web/js/guided.js b/extensions/GuidedBugEntry/web/js/guided.js
index d7fe2c75b..0ff438782 100644
--- a/extensions/GuidedBugEntry/web/js/guided.js
+++ b/extensions/GuidedBugEntry/web/js/guided.js
@@ -14,8 +14,6 @@ var History = YAHOO.util.History;
 var guided = {
   _currentStep: '',
   _defaultStep: 'product',
-  detectedPlatform: '',
-  detectedOpSys: '',
   currentUser: '',
   openStates: [],
   updateStep: true,
@@ -198,15 +196,6 @@ var product = {
       Dom.get('groups').value = products['_default'].secgroup;
     }
 
-    // use the correct platform & op_sys
-    if (products[productName] && products[productName].detectPlatform) {
-      Dom.get('rep_platform').value = guided.detectedPlatform;
-      Dom.get('op_sys').value = guided.detectedOpSys;
-    } else {
-      Dom.get('rep_platform').value = 'All';
-      Dom.get('op_sys').value = 'All';
-    }
-
     // show support message
     if (products[productName] && products[productName].support) {
       Dom.get("product_support_message").innerHTML = products[productName].support;
@@ -834,6 +823,10 @@ var bugForm = {
       elVersions.value = '';
     }
     bugForm.onVersionChange(elVersions.value);
+
+    // set default hw/os
+    Dom.get('rep_platform').value = product.details.default_platform;
+    Dom.get('op_sys').value = product.details.default_op_sys;
   },
 
   onComponentChange: function(componentName) {
-- 
cgit v1.2.3-24-g4f1b