Skip to content

Commit 4c75170

Browse files
committed
Bug 1169173: Empty emails for overdue requests
1 parent 587b71d commit 4c75170

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

extensions/RequestNagger/bin/send-request-nags.pl

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
sub send_nags {
7777
my (%args) = @_;
7878
my $requests = {};
79+
my $watching = $args{template} eq 'watching';
7980

8081
# get requests
8182

@@ -121,13 +122,15 @@ sub send_nags {
121122
@{ $rh->{types}->{$report} }
122123
);
123124

124-
# remove links to reports with too many items to display
125-
my $total = 0;
126-
foreach my $type (@{ $rh->{types}->{$report} }) {
127-
$total += scalar(@{ $rh->{$report}->{$type} });
128-
}
129-
if ($total > MAX_SETTER_COUNT) {
130-
$rh->{types}->{$report} = [];
125+
if ($watching && $report eq 'setter') {
126+
# remove links to reports with too many items to display
127+
my $total = 0;
128+
foreach my $type (@{ $rh->{types}->{$report} }) {
129+
$total += scalar(@{ $rh->{$report}->{$type} });
130+
}
131+
if ($total > MAX_SETTER_COUNT) {
132+
$rh->{types}->{$report} = [];
133+
}
131134
}
132135
}
133136
}

extensions/RequestNagger/template/en/default/account/prefs/request_nagging.html.tmpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
[% END %]
4646
</p>
4747

48-
<p>Add users to my watch list (comma separated list):
48+
<p>
49+
Add users to my watch list (comma separated list):<br>
4950
[% INCLUDE global/userselect.html.tmpl
5051
id => "add_watching"
5152
name => "add_watching"

0 commit comments

Comments
 (0)