diff options
Diffstat (limited to 'extensions/RequestNagger/template/en/default/email/request_nagging-watching.html.tmpl')
| -rw-r--r-- | extensions/RequestNagger/template/en/default/email/request_nagging-watching.html.tmpl | 121 |
1 files changed, 71 insertions, 50 deletions
diff --git a/extensions/RequestNagger/template/en/default/email/request_nagging-watching.html.tmpl b/extensions/RequestNagger/template/en/default/email/request_nagging-watching.html.tmpl index 91fb36e1d..14e4d7f4e 100644 --- a/extensions/RequestNagger/template/en/default/email/request_nagging-watching.html.tmpl +++ b/extensions/RequestNagger/template/en/default/email/request_nagging-watching.html.tmpl @@ -18,70 +18,55 @@ <body bgcolor="#ffffff"> <p> - The following is a list of people who you are watching that have overdue - requests. + The following is a list of people who you are watching that are involved in + overdue requests. </p> -<hr> - [% FOREACH login = requests.keys.sort %] - [% requestee = requests.$login.requestee %] - [% requestee.identity FILTER html %] + [% + target = requests.item(login).target; + requestee = requests.item(login).requestee; + setter = requests.item(login).setter; + summary = requests.item(login).summary; + bug_ids = requests.item(login).bug_ids; + %] + <h3> + [% target.realname || target.login FILTER html %] + </h3> <ul> - <li> - [%+ FOREACH type = requests.$login.typelist %] - [% requests.$login.types.item(type).size %] [%+ type FILTER html %] - [% ", " UNLESS loop.last %] - [% END %] + [% IF requestee.size %] + <li> + Requested of: [% summary.requestee FILTER html %] + (<a href="[% urlbase FILTER none %]buglist.cgi?bug_id=[% bug_ids.requestee.join(",") FILTER uri %]">buglist</a>) + </li> + [% END %] + [% IF setter.size %] + <li> + Waiting on: [% summary.setter FILTER html %] + (<a href="[% urlbase FILTER none %]buglist.cgi?bug_id=[% bug_ids.setter.join(",") FILTER uri %]">buglist</a>) + </li> + [% END %] </li> </ul> [% END %] [% FOREACH login = requests.keys.sort %] - [% requestee = requests.$login.requestee %] - - [% bug_ids = [] %] - [% FOREACH type = requests.$login.typelist %] - [% FOREACH request = requests.$login.types.$type %] - [% bug_ids.push(request.bug.id) %] - [% END %] - [% END %] + [% + target = requests.item(login).target; + requestee = requests.item(login).requestee; + setter = requests.item(login).setter; + summary = requests.item(login).summary; + types = requests.item(login).types; + %] <hr> + <h3> - [% requestee.identity FILTER html %] - <span style="font-size: x-small; font-weight: normal"> - (<a href="[% urlbase FILTER none %]buglist.cgi?bug_id=[% bug_ids.join(",") FILTER uri %]">buglist</a>) - </span><br> - <span style="font-size: x-small; font-weight: normal"> - [% FOREACH type = requests.$login.typelist %] - [% requests.$login.types.item(type).size %] [%+ type FILTER html %] - [% ", " UNLESS loop.last %] - [% END %] - </span> + [% target.realname || target.login FILTER html %]<br> </h3> - [% FOREACH type = requests.$login.typelist %] - - <h3>[% type FILTER upper FILTER html %] requests</h3> - - <ul> - [% FOREACH request = requests.$login.types.$type %] - <li> - <a href="[% urlbase FILTER none %]show_bug.cgi?id=[% request.bug.id FILTER none %]" - title="[% request.bug.tooltip FILTER html %]"> - [% request.bug.id FILTER none %] - [% request.bug.short_desc FILTER html %] - </a><br> - <b>[%+ request.flag.age FILTER html %]</b> from [% request.requester.identity FILTER html %]<br> - [% IF request.flag.deferred %] - Deferred until [%+ request.flag.deferred.ymd FILTER html %]<br> - [% END %] - <br> - </li> - [% END %] - </ul> - - [% END %] + [% PROCESS requests report="requestee" request_list=requestee %] + [% PROCESS requests report="setter" request_list=setter %] [% END %] @@ -102,3 +87,39 @@ @@body-headers@@ </body> </html> + +[% BLOCK requests %] + [% RETURN UNLESS request_list.size %] + [% FOREACH type IN types.item(report) %] + + <h3> + [% type FILTER upper FILTER html %] + [%= report == "requestee" ? "requested of" : "waiting on" FILTER none %] + </h3> + + <ul> + [% FOREACH request IN request_list.item(type) %] + <li> + <a href="[% urlbase FILTER none %]show_bug.cgi?id=[% request.bug.id FILTER none %]" + title="[% request.bug.tooltip FILTER html %]"> + [% request.bug.id FILTER none %] - [% request.bug.short_desc FILTER html %] + </a><br> + + <b>[% request.flag.age FILTER html %]</b> + [% IF report == "requestee" %] + from [% request.setter.realname || request.setter.login FILTER html %] + [% ELSE %] + to [% request.requestee.realname || request.requestee.login FILTER html %] + [% END %] + + [% IF request.flag.deferred %] + <br> + Deferred until [%+ request.flag.deferred.ymd FILTER html %]<br> + [% END %] + </li> + [% END %] + </ul> + + [% END %] + +[% END %] |