aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2013-02-13 12:36:08 +0000
committerMatthew Somerville <matthew@mysociety.org>2013-02-13 12:36:08 +0000
commita371400b11a41497737500969a1a6d1dffc45cef (patch)
treed65850e194c44c46b9fb1d5ec46ac67d3453df5a
parentbe76b91a31a445f87466693968fe7bba3d0abe04 (diff)
Couple of fixes to enable EmptyHomes to send reports again.
-rw-r--r--perllib/FixMyStreet/DB/ResultSet/Problem.pm3
-rw-r--r--perllib/FixMyStreet/SendReport/EmptyHomes.pm2
2 files changed, 3 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index 078c78d0e..6ec1d907e 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -310,6 +310,7 @@ sub send_reports {
my $sender = "FixMyStreet::SendReport::EmptyHomes";
$reporters{ $sender } = $sender->new() unless $reporters{$sender};
$reporters{ $sender }->add_body( $body );
+ $sender_count = 1;
} else {
@@ -378,7 +379,7 @@ sub send_reports {
if (mySociety::Config::get('STAGING_SITE') && !mySociety::Config::get('SEND_REPORTS_ON_STAGING')) {
# on a staging server send emails to ourselves rather than the bodies
- %reporters = map { $_ => $reporters{$_} } grep { /FixMyStreet::SendReport::(Email|NI)/ } keys %reporters;
+ %reporters = map { $_ => $reporters{$_} } grep { /FixMyStreet::SendReport::(Email|NI|EmptyHomes)/ } keys %reporters;
unless (%reporters) {
%reporters = ( 'FixMyStreet::SendReport::Email' => FixMyStreet::SendReport::Email->new() );
}
diff --git a/perllib/FixMyStreet/SendReport/EmptyHomes.pm b/perllib/FixMyStreet/SendReport/EmptyHomes.pm
index b116ee206..4bae6af46 100644
--- a/perllib/FixMyStreet/SendReport/EmptyHomes.pm
+++ b/perllib/FixMyStreet/SendReport/EmptyHomes.pm
@@ -33,7 +33,7 @@ sub build_recipient_list {
push @{ $self->to }, [ $body_email, $body->name ];
$recips{$body_email} = 1;
- my $area_info = mySociety::MaPit::call('area', $body->area_id);
+ my $area_info = mySociety::MaPit::call('area', $body->body_areas->first->area_id);
my $country = $area_info->{country};
if ($country eq 'W') {
$recips{ 'wales@' . mySociety::Config::get('EMAIL_DOMAIN') } = 1;