From 3cd9430a0de3f9a4c066688ef6972b323aff6bea Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Thu, 30 Jul 2015 01:43:21 +0000
Subject: Bug 1188561: Pre-populate form.fxos.feature fields with GET
 parameters

---
 extensions/BMO/Extension.pm                         | 12 ++++++++++++
 .../bug/create/create-fxos-feature.html.tmpl        | 21 +++++++++++++--------
 2 files changed, 25 insertions(+), 8 deletions(-)

(limited to 'extensions/BMO')

diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index 4b3c3bb6e..3fa547d7a 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -2199,4 +2199,16 @@ sub _split_crash_signature {
     ];
 }
 
+sub enter_bug_entrydefaultvars {
+    my ($self, $args) = @_;
+    my $vars = $args->{vars};
+    my $cgi  = Bugzilla->cgi;
+
+    if ($cgi->param('format') eq 'fxos-feature') {
+        $vars->{feature_type} = $cgi->param('feature_type');
+        $vars->{description}  = $cgi->param('description');
+        $vars->{discussion}   = $cgi->param('discussion');
+    }
+}
+
 __PACKAGE__->NAME;
diff --git a/extensions/BMO/template/en/default/bug/create/create-fxos-feature.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-fxos-feature.html.tmpl
index ec0cc84c9..ae6a8873f 100644
--- a/extensions/BMO/template/en/default/bug/create/create-fxos-feature.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-fxos-feature.html.tmpl
@@ -149,8 +149,10 @@ $(function() {
     Is this a defect with existing functionality or a new feature request?
   </div>
   <select id="feature_type" name="feature_type">
-    <option value="new">New Feature Request</option>
-    <option value="existing">Existing Feature Defect</option>
+    <option value="new" [%= "selected" IF feature_type == 'new' %]>
+      New Feature Request</option>
+    <option value="existing" [%= "selected" IF feature_type == 'existing' %]>
+      Existing Feature Defect</option>
   </select>
 </div>
 
@@ -160,7 +162,8 @@ $(function() {
     Please enter a title for your feature request that is brief and self explanatory.
     (Example: "Memory dialing using keypad numbers")
   </div>
-  <input type="text" name="short_desc" id="short_desc" size="80">
+  <input type="text" name="short_desc" id="short_desc"
+         size="80" value="[% short_desc FILTER html %]">
 </div>
 
 <div class="form_section">
@@ -171,7 +174,8 @@ $(function() {
     Instead the user must search for an find the contact in their contact list.").
     If the described feature only applies to certain device types (eg. tablet vs. smartphone), please make note of it.
   </div>
-  <textarea id="description" name="description" cols="80" rows="5"></textarea>
+  <textarea id="description" name="description" cols="80" rows="5">
+    [% description FILTER html %]</textarea>
 </div>
 
 <div class="form_section">
@@ -179,8 +183,8 @@ $(function() {
   <div class="field_desc">
   </div>
   <select id="discussion" name="discussion">
-    <option value="no">No</option>
-    <option value="yes">Yes</option>
+    <option value="no" [%= "selected" IF discussion == 'no' %]>No</option>
+    <option value="yes" [%= "selected" IF discussion == 'yes' %]>Yes</option>
   </select>
 </div>
 
@@ -190,7 +194,8 @@ $(function() {
     The mailing list post where this was discussed.<br>
     e.g. https://groups.google.com/a/mozilla.com/forum/#!topic/foxfood-feedback/eCg6KaVD4FE
   </div>
-  <input type="text" name="bug_file_loc" id="bug_file_loc" size="80" disabled>
+  <input type="text" name="bug_file_loc" id="bug_file_loc" size="80"
+         value="[% bug_file_loc FILTER html %]" disabled>
 </div>
 
 <div class="form_section thread hidden">
@@ -202,7 +207,7 @@ $(function() {
   [% INCLUDE global/userselect.html.tmpl
      id       => "cc"
      name     => "cc"
-     value    => ""
+     value    => cc
      size     => 80
      classes  => ["bz_userfield"]
      multiple => 5
-- 
cgit v1.2.3-24-g4f1b