Bug 847448 - Add url field (bug_file_loc) to form.doc

2 files changed, 14 insertions, 3 deletions

diff --git a/.htaccess b/.htaccess
index 333dde2a5..e927ad44f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -50,6 +50,6 @@ RewriteRule ^form[\.:]brownbag$ enter_bug.cgi?product=Air+Mozilla&format=brownba
 RewriteRule ^form[\.:]finance$ enter_bug.cgi?product=Finance&format=finance
 RewriteRule ^form[\.:]privacy[\.\-:]data$ enter_bug.cgi?product=Privacy&format=privacy-data
 RewriteRule ^form[\.:]moz[\.\-:]project[\.\-:]review$ enter_bug.cgi?product=mozilla.org&format=moz-project-review
-RewriteRule ^form[\.:]docs?$ enter_bug.cgi?product=Developer+Documentation&format=doc
+RewriteRule ^form[\.:]docs?$ enter_bug.cgi?product=Developer+Documentation&format=doc [QSA]
 RewriteRule ^form[\.:]mdn?$ enter_bug.cgi?product=Mozilla+Developer+Network&format=mdn
 RewriteRule ^form[\.:](swag|gear)$ enter_bug.cgi?product=mozilla.org&format=swag
diff --git a/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl
index 7e1341882..37d0fa0f6 100644
--- a/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl
@@ -42,6 +42,9 @@ function validateAndSubmit() {
    yui = [ 'autocomplete', 'datatable', 'button' ]
 %]
 
+[% USE Bugzilla %]
+[% cgi = Bugzilla.cgi %]
+
 <h1>Developer Documentation Request</h1>
 
 <p>
@@ -67,7 +70,7 @@ function validateAndSubmit() {
     <select name="type" id="type">
       <option value="">Please select..</option>
       <option value="New Documentation">New Documentation</option>
-      <option value="Correction">Correction</option>
+      <option value="Correction" [% "selected" IF cgi.param('bug_file_loc') %]>Correction</option>
     </select>
   </td>
 </tr>
@@ -91,7 +94,7 @@ function validateAndSubmit() {
   <td>
     Please provide a brief summary of what documentation you're requesting, or
     what problem you're reporting in existing documentation:<br>
-    <input type="text" name="short_desc" id="short_desc">
+    <input type="text" name="short_desc" id="short_desc" size="60">
   </td>
 </tr>
 
@@ -131,6 +134,14 @@ function validateAndSubmit() {
 [% END %]
 
 <tr>
+  <th>Page to Update</th>
+  <td>
+    <input type="text" name="bug_file_loc" id="short_desc" size="60"
+           value="[% bug_file_loc FILTER html %]">
+  </td>
+</tr>
+
+<tr>
   <th>Technical Contact</th>
   <td>
     [% INCLUDE global/userselect.html.tmpl