From 872ad2b238317ff1c81633b25cfb3460886d0029 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Tue, 6 Mar 2012 22:05:20 +0100
Subject: Bug 731323: Wrong URLs in the "Total" row at the bottom of tabular
 reports when JS is enabled and a user field is used for the vertical axis
 r=gerv a=LpSolit

---
 template/en/default/reports/report-table.html.tmpl | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl
index 561d0517e..d32335ce8 100644
--- a/template/en/default/reports/report-table.html.tmpl
+++ b/template/en/default/reports/report-table.html.tmpl
@@ -50,6 +50,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 +64,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+$/,"")
-- 
cgit v1.2.3-24-g4f1b


From e8b8b99a2eedfd95475dba7533badd747e82aa15 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Tue, 6 Mar 2012 22:11:17 +0100
Subject: Bug 545610: Correctly parse CGI parameters, especially when using
 mod_perl r=gerv a=LpSolit

---
 template/en/default/reports/report-table.html.tmpl | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

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

diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl
index d32335ce8..15de4bc90 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">
-- 
cgit v1.2.3-24-g4f1b


From c3192ab0181f43f6806340da301c12895114769f Mon Sep 17 00:00:00 2001
From: Marc Schumann <wurblzap@gmail.com>
Date: Sat, 10 Mar 2012 17:07:30 +0100
Subject: Tabular reports' column headers do not use display_value. r/a=LpSolit

https://bugzilla.mozilla.org/show_bug.cgi?id=734413
---
 template/en/default/reports/report-table.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl
index 15de4bc90..8a3ab9524 100644
--- a/template/en/default/reports/report-table.html.tmpl
+++ b/template/en/default/reports/report-table.html.tmpl
@@ -102,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,
-- 
cgit v1.2.3-24-g4f1b