Skip to content

bugzilla
bugzilla
Commit 7d01e4bc authored by timeless%mozdev.org's avatar timeless%mozdev.org
Browse files
Options

Bug 321691 duplicates.cgi doesn't use <th>

r=lpsolit a=justdave
parent c7a58f1e
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 98 deletions
template/en/default/filterexceptions.pl
View file @ 7d01e4bc
...@@ -104,10 +104,6 @@ ...@@ -104,10 +104,6 @@
], ],
'reports/duplicates-table.html.tmpl' => [ 'reports/duplicates-table.html.tmpl' => [
'"&amp;maxrows=$maxrows" IF maxrows',
'"&amp;changedsince=$changedsince" IF changedsince',
'"&amp;bug_id=$bug_ids_string&amp;sortvisible=1"
IF sortvisible',
'column.name', 'column.name',
'column.description', 'column.description',
'bug.id', 'bug.id',
......
template/en/default/reports/duplicates-table.html.tmpl
View file @ 7d01e4bc
...@@ -48,101 +48,99 @@ ...@@ -48,101 +48,99 @@
[% IF bug_ids.size > 0 %] [% IF bug_ids.size > 0 %]
<table border> <table border>
<tr bgcolor="#CCCCCC"> <thead>
[% FOREACH column = [ { name => "id", description => "$terms.Bug #" }, <tr bgcolor="#CCCCCC">
{ name => "count", description => "Dupe<br>Count" }, [% FOREACH column = [ { name => "id", description => "$terms.Bug #" },
{ name => "delta", { name => "count", description => "Dupe<br>Count" },
description => "Change in last<br>$changedsince day(s)" }, { name => "delta",
{ name => "component", description => "Component" }, description => "Change in last<br>$changedsince day(s)" },
{ name => "bug_severity", description => "Severity" }, { name => "component", description => "Component" },
{ name => "op_sys", description => "Op Sys" }, { name => "bug_severity", description => "Severity" },
{ name => "target_milestone", { name => "op_sys", description => "Op Sys" },
description => "Target<br>Milestone" }, { name => "target_milestone",
{ name => "short_desc", description => "Summary" } ] description => "Target<br>Milestone" },
%] { name => "short_desc", description => "Summary" } ]
%]
[%# Small hack to keep delta column out if we don't need it %]
[% NEXT IF column.name == "delta" AND NOT dobefore %] [%# Small hack to keep delta column out if we don't need it %]
[% NEXT IF column.name == "delta" AND NOT dobefore %]
<td>
<center> <th>
<b> [% bug_ids_string = bug_ids.join(',') %]
[% bug_ids_string = bug_ids.join(',') %] <a href="duplicates.cgi?sortby=[% column.name %]
<a href="duplicates.cgi?sortby=[% column.name %] [% IF sortby == column.name %]
[% IF sortby == column.name %] [% "&amp;reverse=1" IF NOT reverse %]
[% "&amp;reverse=1" IF NOT reverse %] [% ELSE %]
[% ELSE %] [%-# Some columns start off reversed %]
[%-# Some columns start off reversed %] [% "&amp;reverse=1" IF column.name.match('delta|count') %]
[% "&amp;reverse=1" IF column.name.match('delta|count') %] [% END %]
[% END %] [% IF maxrows %]&amp;maxrows=[% maxrows FILTER html %][% END %]
[% "&amp;maxrows=$maxrows" IF maxrows %] [% IF changedsince %]&amp;changedsince=[% changedsince FILTER html %][% END %]
[% "&amp;changedsince=$changedsince" IF changedsince %] [% "&amp;openonly=1" IF openonly %]
[% "&amp;openonly=1" IF openonly %] [% FOREACH p = query_products %]&amp;product=[% p FILTER html %][% END %]
[% FOREACH p = query_products %]&amp;product=[% p FILTER html %][% END %] [% IF format %]&amp;format=[% format FILTER html %][% END %]
[% IF format %]&amp;format=[% format FILTER html %][% END %] [% IF sortvisible %]&amp;bug_id=[% bug_ids_string FILTER html %]&amp;sortvisible=1[% END %]">
[% "&amp;bug_id=$bug_ids_string&amp;sortvisible=1" [% column.description %]</a>
IF sortvisible %]"> </th>
[% column.description %]</a> [% END %]
</b> </tr>
</center> </thead>
</td>
[% IF NOT sortby %]
[% sortby = "count"; reverse = "1" %]
[% END %]
[% IF sortby == "id" OR sortby == "count" OR sortby == "delta" %]
[%# Numeric sort %]
[% sortedbugs = bugs.nsort(sortby) %]
[% ELSE %]
[% sortedbugs = bugs.sort(sortby) %]
[% END %]
[% IF reverse %]
[% bugs = sortedbugs.reverse %]
[% ELSE %]
[% bugs = sortedbugs %]
[% END %]
[%# *** Buglist *** %]
<tbody>
[%# We need to keep track of the bug IDs we are actually displaying, because
# if the user decides to sort the visible list, we need to know what that
# list actually is. %]
[% vis_bug_ids = [] %]
[% FOREACH bug = bugs %]
[% LAST IF loop.index() >= maxrows %]
[% vis_bug_ids.push(bug.id) %]
<tr [% "class='resolved'" IF bug.resolution != "" %]>
<td>
<center>
[% isclosed = bug.resolution != "" %]
<a href="show_bug.cgi?id=[% bug.id %]">[% bug.id FILTER closed(isclosed) %]</a>
</center>
</td>
<td>
<center>
[% bug.count %]
</center>
</td>
[% IF dobefore %]
<td><center>[% bug.delta %]</center></td>
[% END %]
<td>[% bug.component FILTER html %]</td>
<td><center>[% bug.bug_severity FILTER html %]</center></td>
<td><center>[% bug.op_sys FILTER html %]</center></td>
<td><center>[% bug.target_milestone FILTER html %]</center></td>
<td>[% bug.short_desc FILTER html %]</td>
</tr>
[% END %] [% END %]
</tr> </tbody>
[% IF NOT sortby %]
[% sortby = "count"; reverse = "1" %]
[% END %]
[% IF sortby == "id" OR sortby == "count" OR sortby == "delta" %]
[%# Numeric sort %]
[% sortedbugs = bugs.nsort(sortby) %]
[% ELSE %]
[% sortedbugs = bugs.sort(sortby) %]
[% END %]
[% IF reverse %]
[% bugs = sortedbugs.reverse %]
[% ELSE %]
[% bugs = sortedbugs %]
[% END %]
[%# *** Buglist *** %]
[%# We need to keep track of the bug IDs we are actually displaying, because
# if the user decides to sort the visible list, we need to know what that
# list actually is. %]
[% vis_bug_ids = [] %]
[% FOREACH bug = bugs %]
[% LAST IF loop.index() >= maxrows %]
[% vis_bug_ids.push(bug.id) %]
<tr [% "class='resolved'" IF bug.resolution != "" %]>
<td>
<center>
[% isclosed = bug.resolution != "" %]
<a href="show_bug.cgi?id=[% bug.id %]">[% bug.id FILTER closed(isclosed) %]</a>
</center>
</td>
<td>
<center>
[% bug.count %]
</center>
</td>
[% IF dobefore %]
<td><center>[% bug.delta %]</center></td>
[% END %]
<td>[% bug.component FILTER html %]</td>
<td><center>[% bug.bug_severity FILTER html %]</center></td>
<td><center>[% bug.op_sys FILTER html %]</center></td>
<td><center>[% bug.target_milestone FILTER html %]</center></td>
<td>[% bug.short_desc FILTER html %]</td>
</tr>
[% END %]
</table> </table>
[% ELSE %] [% ELSE %]
<h3>No duplicate [% terms.bugs %] found.</h3> <h3>No duplicate [% terms.bugs %] found.</h3>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment