From b3cd785e1f0e86d59ce6e66f3789fe717d38e676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@netscape.net>
Date: Fri, 11 Aug 2017 16:04:55 +0200
Subject: Include all field values given by drakbug when creating a new bug
 report (mga#21499)

---
 .../en/default/bug/create/create-guided.html.tmpl       | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/extensions/Mageia/template/en/default/bug/create/create-guided.html.tmpl b/extensions/Mageia/template/en/default/bug/create/create-guided.html.tmpl
index 7f0f22ac8..c672a4cf5 100644
--- a/extensions/Mageia/template/en/default/bug/create/create-guided.html.tmpl
+++ b/extensions/Mageia/template/en/default/bug/create/create-guided.html.tmpl
@@ -10,9 +10,6 @@
   # This template has the same interface as create.html.tmpl
   #%]
 
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
 [% PROCESS global/header.html.tmpl
    title = "Enter $terms.ABug"
    onload = "PutDescription()"
@@ -131,7 +128,7 @@ function CheckDetails(e) {
   <tr>
     [% INCLUDE "bug/field-label.html.tmpl" field = bug_fields.cf_rpmpkg editable = 1 %]
     <td>
-      <input size="80" name="cf_rpmpkg" id="cf_rpmpkg">
+      <input size="80" name="cf_rpmpkg" id="cf_rpmpkg" value="[% default.cf_rpmpkg FILTER html %]">
       <p>
         This is where you can identify exactly which RPM package is involved in
         this [% terms.bug %] report. For instance, if you know the problem you
@@ -151,7 +148,8 @@ function CheckDetails(e) {
   <tr>
     [% INCLUDE "bug/field-label.html.tmpl" field = bug_fields.bug_file_loc editable = 1 %]
     <td>
-      <input size="80" name="bug_file_loc" placeholder="https://">
+      <input id="bug_file_loc" name="bug_file_loc" placeholder="https://" size="80"
+        [% IF bug_file_loc != "http://" %] value="[% bug_file_loc FILTER html %]"[% END %]>
       <p>
         URL that demonstrates the problem you are submitting (optional).
       </p>
@@ -161,8 +159,9 @@ function CheckDetails(e) {
   <tr>
     [% INCLUDE "bug/field-label.html.tmpl" field = bug_fields.short_desc editable = 1 %]
     <td>
-      <input size="80" name="short_desc" id="short_desc" maxlength="255"
-             spellcheck="true" aria-required="true" class="required" required>
+      <input name="short_desc" id="short_desc" size="80" maxlength="255"
+             value="[% short_desc FILTER html %]" spellcheck="true"
+             aria-required="true" class="required" required>
       <p>
         A sentence which summarizes the problem.
         Please be descriptive and use lots of keywords.
@@ -189,7 +188,7 @@ function CheckDetails(e) {
          minrows   = 13
          cols      = constants.COMMENT_COLS
          mandatory = 1
-         defaultcontent = defaultcontent
+         defaultcontent = comment || defaultcontent
       %]
 
       [% IF user.is_insider %]
@@ -225,7 +224,7 @@ function CheckDetails(e) {
           <br><br>
           Version-Release number of selected component (if applicable):
           <br><br>
-          openldap-2.4.40-3.1.mga5, pam-1.1.8-10.1.mga5
+          openldap-2.4.45-2.mga6, pam-1.3.0-5.mga6
           <br><br>
           How reproducible:
           <br><br>
-- 
cgit v1.2.1