merged with bugzilla/4.2

2 files changed, 25 insertions, 16 deletions

diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 7b305a248..f9d7f0cf0 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -176,7 +176,7 @@
               [% END %]
             >reply</a>]
             <script type="text/javascript"><!--
-              addCollapseLink([% count %]); // -->
+              addCollapseLink([% count %], 'Toggle comment display'); // -->
             </script>
           </span>
         [% END %]
diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index a7e318c4d..4ed686248 100644
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -226,22 +226,31 @@
                                                  'keyword_autocomplete');
        </script>
   [% END %]
-[% ELSIF field.type == constants.FIELD_TYPE_TEXTAREA %]
-  <div class="uneditable_textarea">[% value FILTER html %]</div>
-[% ELSIF field.type == constants.FIELD_TYPE_BUG_ID %]
-    [% IF value %]  
-        [% value FILTER bug_link(value, use_alias => 1) FILTER none %]
-    [% END %]
-[% ELSIF field.type == constants.FIELD_TYPE_BUG_URLS %]
-  [% '<ul class="bug_urls">' IF value.size %]
-    [% FOREACH bug_url = value %]
-      <li>
-        [% PROCESS bug_url_link bug_url = bug_url %]
-      </li>
-    [% END %]
-  [% '</ul>' IF value.size %]
 [% ELSE %]
-  [% value.join(', ') FILTER html %]
+  [% SWITCH field.type %]
+    [% CASE constants.FIELD_TYPE_TEXTAREA %]
+      <div class="uneditable_textarea">[% value FILTER html %]</div>
+    [% CASE constants.FIELD_TYPE_BUG_ID %]
+      [% IF value %]  
+          [% value FILTER bug_link(value, use_alias => 1) FILTER none %]
+      [% END %]
+    [% CASE [ constants.FIELD_TYPE_SINGLE_SELECT 
+              constants.FIELD_TYPE_MULTI_SELECT ] %]
+      [% FOREACH val = value %]
+        [% display_value(field.name, val) FILTER html %]
+        [% ', ' UNLESS loop.last() %]
+      [% END %]
+    [% CASE constants.FIELD_TYPE_BUG_URLS %]
+      [% '<ul class="bug_urls">' IF value.size %]
+        [% FOREACH bug_url = value %]
+          <li>
+            [% PROCESS bug_url_link bug_url = bug_url %]
+          </li>
+        [% END %]
+      [% '</ul>' IF value.size %]
+    [% CASE %]
+      [% value.join(', ') FILTER html %]
+  [% END %]
 [% END %]
 [% Hook.process('end_field_column') %]
 [% '</td>' IF NOT no_tds %]