summaryrefslogtreecommitdiffstats
path: root/extensions/RequestNagger
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2015-06-02 07:20:15 +0200
committerByron Jones <glob@mozilla.com>2015-06-02 07:20:15 +0200
commit4c751704c9644faf357adeea13584b08a359593d (patch)
treee23b543a6dfee97d50f063c47a5475bf6b38c9d8 /extensions/RequestNagger
parent587b71df697de3ddd3834cd9f241328b4437c242 (diff)
downloadbugzilla-4c751704c9644faf357adeea13584b08a359593d.tar.gz
bugzilla-4c751704c9644faf357adeea13584b08a359593d.tar.xz
Bug 1169173: Empty emails for overdue requests
Diffstat (limited to 'extensions/RequestNagger')
-rwxr-xr-xextensions/RequestNagger/bin/send-request-nags.pl17
-rw-r--r--extensions/RequestNagger/template/en/default/account/prefs/request_nagging.html.tmpl3
2 files changed, 12 insertions, 8 deletions
diff --git a/extensions/RequestNagger/bin/send-request-nags.pl b/extensions/RequestNagger/bin/send-request-nags.pl
index ae8d8fd3f..e621a8bdc 100755
--- a/extensions/RequestNagger/bin/send-request-nags.pl
+++ b/extensions/RequestNagger/bin/send-request-nags.pl
@@ -76,6 +76,7 @@ send_nags(
sub send_nags {
my (%args) = @_;
my $requests = {};
+ my $watching = $args{template} eq 'watching';
# get requests
@@ -121,13 +122,15 @@ sub send_nags {
@{ $rh->{types}->{$report} }
);
- # remove links to reports with too many items to display
- my $total = 0;
- foreach my $type (@{ $rh->{types}->{$report} }) {
- $total += scalar(@{ $rh->{$report}->{$type} });
- }
- if ($total > MAX_SETTER_COUNT) {
- $rh->{types}->{$report} = [];
+ if ($watching && $report eq 'setter') {
+ # remove links to reports with too many items to display
+ my $total = 0;
+ foreach my $type (@{ $rh->{types}->{$report} }) {
+ $total += scalar(@{ $rh->{$report}->{$type} });
+ }
+ if ($total > MAX_SETTER_COUNT) {
+ $rh->{types}->{$report} = [];
+ }
}
}
}
diff --git a/extensions/RequestNagger/template/en/default/account/prefs/request_nagging.html.tmpl b/extensions/RequestNagger/template/en/default/account/prefs/request_nagging.html.tmpl
index 90f753903..eba09ef00 100644
--- a/extensions/RequestNagger/template/en/default/account/prefs/request_nagging.html.tmpl
+++ b/extensions/RequestNagger/template/en/default/account/prefs/request_nagging.html.tmpl
@@ -45,7 +45,8 @@
[% END %]
</p>
-<p>Add users to my watch list (comma separated list):
+<p>
+ Add users to my watch list (comma separated list):<br>
[% INCLUDE global/userselect.html.tmpl
id => "add_watching"
name => "add_watching"