diff options
| -rw-r--r-- | Bugzilla/Chart.pm | 3 | ||||
| -rwxr-xr-x | buglist.cgi | 2 | ||||
| -rw-r--r-- | template/en/default/reports/chart.png.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/reports/create-chart.html.tmpl | 34 |
4 files changed, 23 insertions, 18 deletions
diff --git a/Bugzilla/Chart.pm b/Bugzilla/Chart.pm index 8d3d9f643..42827750f 100644 --- a/Bugzilla/Chart.pm +++ b/Bugzilla/Chart.pm @@ -89,6 +89,9 @@ sub init { $self->{'datefrom'} = $cgi->param('datefrom'); $self->{'dateto'} = $cgi->param('dateto'); + # If we are cumulating, a grand total makes no sense + $self->{'gt'} = 0 if $self->{'cumulate'}; + # Make sure the dates are ones we are able to interpret foreach my $date ('datefrom', 'dateto') { if ($self->{$date}) { diff --git a/buglist.cgi b/buglist.cgi index b822968c3..116e2ea75 100755 --- a/buglist.cgi +++ b/buglist.cgi @@ -280,7 +280,7 @@ if ($::FORM{'cmdtype'} eq "dorem") { } elsif ($::FORM{'remaction'} eq "runseries") { $::buffer = LookupSeries($::FORM{"series_id"}); - $vars->{'title'} = "Bug List: $::FORM{'namedcmd'}"; + $vars->{'searchname'} = $::FORM{'namedcmd'}; $params = new Bugzilla::CGI($::buffer); $order = $params->param('order') || $order; } diff --git a/template/en/default/reports/chart.png.tmpl b/template/en/default/reports/chart.png.tmpl index 43d4e962d..18452175c 100644 --- a/template/en/default/reports/chart.png.tmpl +++ b/template/en/default/reports/chart.png.tmpl @@ -22,7 +22,7 @@ [% y_label = "Bugs" %] [% x_label = "Time" %] -[% IF cumulate %] +[% IF chart.cumulate %] [% USE graph = GD.Graph.area(width, height) %] [% graph.set(cumulate => "true") %] [% ELSE %] diff --git a/template/en/default/reports/create-chart.html.tmpl b/template/en/default/reports/create-chart.html.tmpl index 2751c7eed..0879d8ec6 100644 --- a/template/en/default/reports/create-chart.html.tmpl +++ b/template/en/default/reports/create-chart.html.tmpl @@ -139,11 +139,11 @@ function subcatSelected() { [% IF chart.lines.size > 0 %] <table cellspacing="2" cellpadding="2"> <tr> - <th>Select</th> + <th style="width: 5em;">Select</th> <th>Label</th> <th></th> <th>Data Set</th> - <th>Subs</th> + <th></th> <th></th> </tr> @@ -182,34 +182,35 @@ function subcatSelected() { </td> <td> - <a href="buglist.cgi?cmdtype=dorem&namedcmd= - [% series.category FILTER html %]- - [% series.subcategory FILTER html %]- - [% series.name FILTER html -%]&series_id= - [% series.series_id %]&remaction=runseries"> [% series.category FILTER html %] / [%+ series.subcategory FILTER html %] / [%+ series.name FILTER html %] - </a> <input type="hidden" name="line[% newidx %]" value="[% series.series_id %]"> </td> <td align="center"> - [% IF series.creator != 0 AND series.isSubscribed(user.id) %] - <input type="submit" value="Unsubscribe" style="width: 12ex;" - name="action-unsubscribe[% series.series_id %]"> - [% ELSE %] - <input type="submit" value="Subscribe" style="width: 12ex;" - name="action-subscribe[% series.series_id %]"> + [% IF series.creator != 0 %] + [% IF series.isSubscribed(user.id) %] + <input type="submit" value="Unsubscribe" style="width: 12ex;" + name="action-unsubscribe[% series.series_id %]"> + [% ELSE %] + <input type="submit" value="Subscribe" style="width: 12ex;" + name="action-subscribe[% series.series_id %]"> + [% END %] [% END %] </td> <td align="center"> [% IF user.id == series.creator OR UserInGroup("admin") %] <a href="chart.cgi?action=edit&series_id= - [% series.series_id %]">Edit</a> + [% series.series_id %]">Edit</a> | [% END %] + <a href="buglist.cgi?cmdtype=dorem&namedcmd= + [% series.category FILTER html %]%20/%20 + [% series.subcategory FILTER html %]%20/%20 + [% series.name FILTER html -%]&series_id= + [% series.series_id %]&remaction=runseries">Run Search</a> </td> </tr> [% END %] @@ -249,7 +250,8 @@ function subcatSelected() { <td style="text-align: right; vertical-align: bottom;"> <b>Cumulate:</b> - <input type="checkbox" name="cumulate" value="1"> + <input type="checkbox" name="cumulate" value="1" + [% " checked" IF chart.cumulate %]> </td> <td></td> |
