merge with bugzilla/4.2

5 files changed, 26 insertions, 19 deletions

diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index ac4727811..fa3a447d7 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -59,10 +59,10 @@
 
 [% BLOCK generate_diffs %]
   [% SET in_table = 0 %]
-  [% last_changer = "" %]
+  [% last_changer = 0 %]
     [% FOREACH change = diffs %]
-      [% IF !isnew && change.who.login != last_changer %]
-        [% last_changer = change.who.login %]
+      [% IF !isnew && changer.id != last_changer %]
+        [% last_changer = changer.id %]
         [% IF in_table == 1 %]
           </table>
           [% SET in_table = 0 %]
diff --git a/template/en/default/email/bugmail.txt.tmpl b/template/en/default/email/bugmail.txt.tmpl
index ff2e6b8fa..c3657ad9f 100644
--- a/template/en/default/email/bugmail.txt.tmpl
+++ b/template/en/default/email/bugmail.txt.tmpl
@@ -54,21 +54,17 @@ You are receiving this mail because:
 [% BLOCK generate_diffs %]
   [% urlbase %]show_bug.cgi?id=[% bug.id %]
 
-[%+ last_changer = "" %]
+[%+ last_changer = 0 %]
   [% FOREACH change = diffs %]
-    [% IF !isnew && change.who.login != last_changer %]
-      [% last_changer = change.who.login %]
+    [% IF !isnew && changer.id != last_changer %]
+      [% last_changer = changer.id %]
       [% IF change.blocker %]
         [% terms.Bug %] [%+ bug.id %] depends on [% terms.bug %] [%+ change.blocker.id %], which changed state.
 
 [%+ terms.Bug %] [%+ change.blocker.id %] Summary: [% change.blocker.short_desc %]
 [%+ urlbase %]show_bug.cgi?id=[% change.blocker.id %]
       [% ELSE %]
-        [%~ IF change.who.name %]
-          [% change.who.name _ " <" _ change.who.login _ ">" %]
-        [% ELSE %]
-          [% change.who.login %]
-        [% END %] changed:
+        [%~ changer.identity %] changed:
       [% END %]
 
            What    |Removed                     |Added
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 7a542f427..c755fa1ed 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -87,7 +87,6 @@
 ],
 
 'reports/report-table.html.tmpl' => [
-  '"&amp;$tbl_vals" IF tbl_vals', 
   '"&amp;$col_vals" IF col_vals', 
   '"&amp;$row_vals" IF row_vals', 
   'classes.$row_idx.$col_idx', 
diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index 03df6911c..6402814e1 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -358,6 +358,9 @@
   <li>YUI has been upgraded to 2.9.0.</li>
   <li>Due to the major code refactor of <kbd>B[%%]ugzilla/Search.pm</kbd>, any
     customization made against this file will probably need to be rewritten.</li>
+  <li>The [% terms.Bugzilla %]-specific <kbd>url_quote</kbd> filter used in templates
+    has been removed and replaced by the <kbd>uri</kbd> filter from Template::Toolkit
+    as they are now similar.</li>
   <li><kbd>long_list.cgi</kbd>, <kbd>showattachment.cgi</kbd> and <kbd>xml.cgi</kbd>
     have been removed from the codebase. As <a href="#v40_code_changes">announced</a>
     in the release notes of [% terms.Bugzilla %] 4.0, these scripts were deprecated
diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl
index 561d0517e..8a3ab9524 100644
--- a/template/en/default/reports/report-table.html.tmpl
+++ b/template/en/default/reports/report-table.html.tmpl
@@ -36,13 +36,14 @@
 
 [% col_field_disp = field_descs.$col_field || col_field %]
 [% row_field_disp = field_descs.$row_field || row_field %]
-  
+
+[% urlbase = BLOCK %]buglist.cgi?[% buglistbase FILTER html %][% END %]
 [% IF tbl == "-total-" %]
-  [% urlbase = BLOCK %]buglist.cgi?[% buglistbase FILTER html %]
-  [% "&amp;$tbl_vals" IF tbl_vals %][% END %]
-[% ELSE %]
-  [% urlbase = BLOCK %]buglist.cgi?[% buglistbase FILTER html %]&amp;
-  [% tbl_field FILTER uri %]=[% tbl FILTER uri %][% END %]
+  [% IF tbl_vals %]
+    [% urlbase = urlbase _ "&amp;" _ tbl_vals %]
+  [% END %]
+[% ELSIF tbl_field %]
+  [% urlbase = BLOCK %][% urlbase %]&amp;[% tbl_field FILTER uri %]=[% tbl FILTER uri %][% END %]
 [% END %]
 
 <script type="text/javascript">
@@ -50,6 +51,10 @@ YAHOO.util.Event.addListener(window, "load", function() {
   this.Linkify = function(elLiner, oRecord, oColumn, oData) {
     if (oData == 0)
       elLiner.innerHTML = ".";
+    else if (oRecord.getData("row_title") == "Total")
+      elLiner.innerHTML = "<a href='[% urlbase %]&amp;[% col_field FILTER js %]="
+                          + oColumn.field + "[% '&amp;' _ row_vals IF row_vals %]'>"
+                          + oData + "</a>";
     else
       elLiner.innerHTML = "<a href='[% urlbase %]&amp;[% row_field FILTER js %]="
                           + oRecord.getData("row_title").replace(/\s+$/,"")
@@ -60,6 +65,10 @@ YAHOO.util.Event.addListener(window, "load", function() {
   this.LinkifyTotal = function(elLiner, oRecord, oColumn, oData) {
     if (oData == 0)
       elLiner.innerHTML = ".";
+    else if (oRecord.getData("row_title") == "Total")
+      elLiner.innerHTML = "<a href='[% urlbase %][% '&amp;' _ row_vals IF row_vals %]
+                          [%~ '&amp;' _ col_vals IF col_vals %]'>"
+                          + oData + "</a>";
     else
       elLiner.innerHTML = "<a href='[% urlbase %]&amp;[% row_field FILTER js %]="
                           + oRecord.getData("row_title").replace(/\s+$/,"")
@@ -93,7 +102,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
   var myColumnDefs = [
         {key:"row_title", label:"", sortable:true, sortOptions: { sortFunction:totalNumberSorter }},
         [% FOREACH col = col_names %]
-          {key:"[% col FILTER js %]", label:"[% col FILTER js %]", sortable:true,
+          {key:"[% col FILTER js %]", label:"[% display_value(col_field, col) FILTER js %]", sortable:true,
            formatter:this.Linkify, sortOptions: { defaultDir: YAHOO.widget.DataTable.CLASS_DESC, sortFunction:totalNumberSorter }},
         [% END %]
         {key:"total", label:"Total", sortable:true, formatter:this.LinkifyTotal,