more porting work

3 files changed, 30 insertions, 9 deletions

diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 92e578e8f..7c7d99408 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -282,8 +282,9 @@
 
   [% USE Bugzilla %]
   [%# Show all legal values and all fields, ignoring visibility controls. %]
-  [% bug = 0 %]
+  [% bug = default.defined ? default : 0 %]
   [% FOREACH field = Bugzilla.active_custom_fields %]
+    [% NEXT IF cf_hidden_in_product(field.name, one_product, components) %]
     <tr>
       [% PROCESS bug/field.html.tmpl value = dontchange
                                      editable = 1
@@ -427,6 +428,7 @@
     [% FOREACH r = resolutions %]
       [% NEXT IF !r %]
       [% NEXT IF r == "DUPLICATE" || r == "MOVED" %]
+      [% NEXT IF r == "EXPIRED" AND user.login != "gerv@mozilla.org" %]
       <option value="[% r FILTER html %]">[% display_value("resolution", r) FILTER html %]</option>
     [% END %]
   </select>
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 28540cdc0..4120fc228 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -42,10 +42,11 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
+[% url_filtered_title = title FILTER url_quote %]
 [% PROCESS global/header.html.tmpl
   title = title
   style = style
-  atomlink = "buglist.cgi?$urlquerypart&title=$title&ctype=atom" 
+  atomlink = "buglist.cgi?$urlquerypart&title=$url_filtered_title&ctype=atom" 
   yui = [ 'autocomplete', 'calendar' ]
   javascript_urls = [ "js/util.js", "js/field.js" ]
   style_urls = [ "skins/standard/buglist.css" ]
@@ -197,7 +198,7 @@
         [% urlquerypart FILTER html %]&amp;ctype=csv&human=1">CSV</a> |
         <a href="buglist.cgi?
         [% urlquerypart FILTER html %]&amp;title=
-        [%- title FILTER html %]&amp;ctype=atom">Feed</a> |
+        [%- title FILTER url_quote %]&amp;ctype=atom">Feed</a> |
         <a href="buglist.cgi?
         [% urlquerypart FILTER html %]&amp;ctype=ics">iCalendar</a> |
         <a href="colchange.cgi?
diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl
index 2b266d4ce..c2964f17c 100644
--- a/template/en/default/list/table.html.tmpl
+++ b/template/en/default/list/table.html.tmpl
@@ -80,12 +80,15 @@
 [%############################################################################%]
 
 [% tableheader = BLOCK %]
-  <table class="bz_buglist" cellspacing="0" cellpadding="4" width="100%">
+  <table class="bz_buglist sortable" cellspacing="0" cellpadding="4" width="100%">
+    <thead> 
     <tr class="bz_buglist_header bz_first_buglist_header">
       [% IF dotweak %]
       <th>&nbsp;</th>
       [% END %]
-      <th colspan="[% splitheader ? 2 : 1 %]" class="first-child">
+      <th colspan="[% splitheader ? 2 : 1 %]" class="first-child
+                   sortable_column_0
+                   sorted_[% lsearch(order_columns, 'bug_id') FILTER html %]">
         <a href="buglist.cgi?
                   [% urlquerypart FILTER html %]&amp;order=
                   [% PROCESS new_order id='bug_id' %]
@@ -100,7 +103,7 @@
         [% FOREACH id = displaycolumns %]
           [% NEXT UNLESS loop.count() % 2 == 0 %]
           [% column = columns.$id %]
-          [% PROCESS columnheader %]
+          [% PROCESS columnheader key=loop.count() %]
         [% END %]
 
         </tr><tr class="bz_buglist_header">
@@ -112,7 +115,7 @@
         [% FOREACH id = displaycolumns %]
           [% NEXT IF loop.count() % 2 == 0 %]
           [% column = columns.$id %]
-          [% PROCESS columnheader %]
+          [% PROCESS columnheader key=loop.count() %]
         [% END %]
 
       [% ELSE %]
@@ -125,10 +128,13 @@
       [% END %]
 
     </tr>
+    </thead>
 [% END %]
 
 [% BLOCK columnheader %]
-  <th colspan="[% splitheader ? 2 : 1 %]">
+  <th colspan="[% splitheader ? 2 : 1 %]"
+      class="sortable_column_[% key FILTER html %]
+             sorted_[% lsearch(order_columns, id) FILTER html %]">
     <a href="buglist.cgi?[% urlquerypart FILTER html %]&amp;order=
       [% PROCESS new_order %]
       [%-#%]&amp;query_based_on=
@@ -168,6 +174,7 @@
 
 [% tableheader %]
 
+<tbody class="sorttable_body">
 [% FOREACH bug = bugs %]
   [% count = loop.count() %]
 
@@ -193,7 +200,17 @@
 
     [% FOREACH column = displaycolumns %]
     <td [% 'style="white-space: nowrap"' IF NOT abbrev.$column.wrap %]
-        class="bz_[% column FILTER css_class_quote %]_column">
+        class="bz_[% column FILTER css_class_quote %]_column"
+        [% SWITCH column %]
+          [% CASE 'opendate' %]
+            sorttable_customkey="[% bug.opentime FILTER html %]"
+          [% CASE 'changeddate' %]
+            sorttable_customkey="[% bug.changedtime FILTER html %]"
+          [% CASE columns_sortkey.keys %]
+            [% SET sortkey = columns_sortkey.$column.${bug.$column} %]
+            sorttable_customkey="[% sortkey FILTER html %]"
+        [% END %]
+    >
       [% IF abbrev.$column.maxlength %]
         <span title="[%- display_value(column, bug.$column) FILTER html %]">
       [% END %]
@@ -228,6 +245,7 @@
   [% END %]
 
 [% END %]
+</tbody>
 
 </table>