From 95b16ee99af37bb2d3e5bd15fa63c6197c399dbe Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Thu, 17 Dec 2009 23:06:14 +0000
Subject: =?UTF-8?q?Bug=20465930:=20Some=20fields=20have=20no=20description?=
 =?UTF-8?q?=20in=20the=20user=20auto-completion=20form=20-=20Patch=20by=20?=
 =?UTF-8?q?Fr=C3=83=C2=A9d=C3=83=C2=A9ric=20Buclin=20<LpSolit@gmail.com>?=
 =?UTF-8?q?=20r=3Dghendricks=20a=3DLpSolit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../en/default/global/confirm-user-match.html.tmpl | 26 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'template/en/default/global')

diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index f961ee0b9..40dccc6b5 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -38,6 +38,22 @@
 [%# use the global field descs %]
 [% PROCESS "global/field-descs.none.tmpl" %]
 
+[%# This lists fields which use the user auto-completion feature and which
+  # are not listed in field_descs. %]
+[% field_labels = { # Used by editcomponents.cgi
+                    "initialcc"               => "Default CC List",
+                    "initialowner"            => "Default Assignee",
+                    "initialqacontact"        => "Default QA Contact",
+                    # Used by process_bug.cgi
+                    "masscc"                  => "CC List",
+                    # Used by request.cgi
+                    "requester"               => "Requester",
+                    "requestee"               => "Requestee",
+                    # Used by userprefs.cgi
+                    "new_watchedusers"        => "Watch List",
+
+   }
+%]
 [% IF matchsuccess == 1 %]
   [% PROCESS global/header.html.tmpl title="Confirm Match" %]
 
@@ -169,14 +185,12 @@
 
 [% BLOCK field_names %]
 
-  [% IF field_descs.${field_name} %]
-    [%  field_descs.${field_name} FILTER html -%]
-
-  [%-# ELSIF for things that don't belong in the field_descs hash here -%]
-
+  [% IF field_descs.$field_name %]
+    [% field_descs.$field_name FILTER html %]
+  [% ELSIF field_labels.$field_name %]
+    [% field_labels.$field_name FILTER html %]
   [% ELSIF field_name.match("^requestee") %]
     [% fields.${field_name}.flag_type.name %] requestee
-
   [% ELSE %]
     [% field_name FILTER html %]
   [% END %]
-- 
cgit v1.2.1