diff options
author | Dave Lawrence <dlawrence@mozilla.com> | 2012-03-19 04:11:53 +0100 |
---|---|---|
committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-03-19 04:11:53 +0100 |
commit | 8f0cc43947fd5d93178b7f98c9548e1c4974d0b3 (patch) | |
tree | 48b837d8586d8f53bc32237bd7fb7ac518585421 /template/en/default/reports | |
parent | 0709dae3eca4422295ad979b85dd8758e2426b76 (diff) | |
parent | 16ca329e85e1a36a4808cc088ebc8f5d18f22dae (diff) | |
download | bugzilla-8f0cc43947fd5d93178b7f98c9548e1c4974d0b3.tar.gz bugzilla-8f0cc43947fd5d93178b7f98c9548e1c4974d0b3.tar.xz |
merge with bugzilla/4.2
Diffstat (limited to 'template/en/default/reports')
-rw-r--r-- | template/en/default/reports/report-table.html.tmpl | 23 |
1 files changed, 16 insertions, 7 deletions
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 %] - [% "&$tbl_vals" IF tbl_vals %][% END %] -[% ELSE %] - [% urlbase = BLOCK %]buglist.cgi?[% buglistbase FILTER html %]& - [% tbl_field FILTER uri %]=[% tbl FILTER uri %][% END %] + [% IF tbl_vals %] + [% urlbase = urlbase _ "&" _ tbl_vals %] + [% END %] +[% ELSIF tbl_field %] + [% urlbase = BLOCK %][% urlbase %]&[% 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 %]&[% col_field FILTER js %]=" + + oColumn.field + "[% '&' _ row_vals IF row_vals %]'>" + + oData + "</a>"; else elLiner.innerHTML = "<a href='[% urlbase %]&[% 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 %][% '&' _ row_vals IF row_vals %] + [%~ '&' _ col_vals IF col_vals %]'>" + + oData + "</a>"; else elLiner.innerHTML = "<a href='[% urlbase %]&[% 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, |