diff options
| author | Edmund Wong <ewong@pw-wspx.org> | 2010-05-19 20:05:38 +0200 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2010-05-19 20:05:38 +0200 |
| commit | d6e7e1bd1c206b1b336f867ba6a51ed8c6e2fbb1 (patch) | |
| tree | e853dcb0b30ce9dae0557fceb204ab83808025a7 | |
| parent | cd82e3949ee97e63915bdf6dfdaef8001958fc90 (diff) | |
| download | bugzilla-d6e7e1bd1c206b1b336f867ba6a51ed8c6e2fbb1.tar.gz bugzilla-d6e7e1bd1c206b1b336f867ba6a51ed8c6e2fbb1.tar.xz | |
Bug 487106: Add explanation when a whining is empty
r=Callek r=LpSolit a=LpSolit
| -rw-r--r-- | template/en/default/whine/mail.html.tmpl | 59 | ||||
| -rw-r--r-- | template/en/default/whine/mail.txt.tmpl | 15 |
2 files changed, 40 insertions, 34 deletions
diff --git a/template/en/default/whine/mail.html.tmpl b/template/en/default/whine/mail.html.tmpl index a4f0edeef..ae4f00cfc 100644 --- a/template/en/default/whine/mail.html.tmpl +++ b/template/en/default/whine/mail.html.tmpl @@ -53,39 +53,42 @@ [% END %] </p> +[% IF queries.size %] + [% FOREACH query=queries %] -[% FOREACH query=queries %] + <h2>[%+ query.title FILTER html %]</h2> - <h2>[%+ query.title FILTER html %]</h2> - - <table width="100%"> - <tr> - <th align="left">ID</th> - <th align="left">Sev</th> - <th align="left">Pri</th> - <th align="left">Plt</th> - <th align="left">Assignee</th> - <th align="left">Status</th> - <th align="left">Resolution</th> - <th align="left">Summary</th> - </tr> - - [% FOREACH bug=query.bugs %] + <table width="100%"> <tr> - <td align="left"><a href="[%+ urlbase FILTER html %]show_bug.cgi?id= - [%- bug.bug_id %]">[% bug.bug_id %]</a></td> - <td align="left">[% display_value("bug_severity", bug.bug_severity) FILTER html %]</td> - <td align="left">[% display_value("priority", bug.priority) FILTER html %]</td> - <td align="left">[% display_value("rep_platform", bug.rep_platform) FILTER html %]</td> - <td align="left">[% bug.assigned_to FILTER html %]</td> - <td align="left">[% display_value("bug_status", bug.bug_status) FILTER html %]</td> - <td align="left">[% display_value("resolution", bug.resolution) FILTER html %]</td> - <td align="left">[% bug.short_desc FILTER html %]</td> + <th align="left">ID</th> + <th align="left">Sev</th> + <th align="left">Pri</th> + <th align="left">Plt</th> + <th align="left">Assignee</th> + <th align="left">Status</th> + <th align="left">Resolution</th> + <th align="left">Summary</th> </tr> - [% END %] - </table> -[% END %] + [% FOREACH bug=query.bugs %] + <tr> + <td align="left"><a href="[%+ urlbase FILTER html %]show_bug.cgi?id= + [%- bug.bug_id %]">[% bug.bug_id %]</a></td> + <td align="left">[% display_value("bug_severity", bug.bug_severity) FILTER html %]</td> + <td align="left">[% display_value("priority", bug.priority) FILTER html %]</td> + <td align="left">[% display_value("rep_platform", bug.rep_platform) FILTER html %]</td> + <td align="left">[% bug.assigned_to FILTER html %]</td> + <td align="left">[% display_value("bug_status", bug.bug_status) FILTER html %]</td> + <td align="left">[% display_value("resolution", bug.resolution) FILTER html %]</td> + <td align="left">[% bug.short_desc FILTER html %]</td> + </tr> + [% END %] + </table> + [% END %] +[% ELSE %] + + <h3>No [% terms.bugs %] were found that matched the search criteria.</h3> +[% END %] </body> </html> diff --git a/template/en/default/whine/mail.txt.tmpl b/template/en/default/whine/mail.txt.tmpl index 862ae2671..13216d895 100644 --- a/template/en/default/whine/mail.txt.tmpl +++ b/template/en/default/whine/mail.txt.tmpl @@ -40,13 +40,13 @@ This search was scheduled by [% author.login %]. [% END %] - -[% FOREACH query=queries %] +[% IF queries.size %] + [% FOREACH query=queries %] [%+ query.title +%] [%+ "-" FILTER repeat(query.title.length) %] - [% FOREACH bug=query.bugs %] + [% FOREACH bug=query.bugs %] [% terms.Bug +%] [%+ bug.bug_id %]: [%+ urlbase %]show_bug.cgi?id=[% bug.bug_id +%] Priority: [%+ display_value("priority", bug.priority) -%] @@ -55,11 +55,14 @@ Assignee: [%+ bug.assigned_to %] Status: [%+ display_value("bug_status", bug.bug_status) %] [%- IF bug.resolution -%] Resolution: [% display_value("resolution", bug.resolution) -%] - [%- END %] + [%- END %] Summary: [% bug.short_desc %] - [% END %] + [% END %] -[% END %] + [% END %] +[% ELSE %] + No [% terms.bugs %] were found that matched the search criteria. +[% END %] |