diff options
Diffstat (limited to 'perllib')
-rw-r--r-- | perllib/FixMyStreet/App/Controller/Admin.pm | 2 | ||||
-rw-r--r-- | perllib/FixMyStreet/DB/ResultSet/Contact.pm | 5 | ||||
-rw-r--r-- | perllib/FixMyStreet/SendReport.pm | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index bd45ad55e..f3d1b2e63 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -180,7 +180,7 @@ sub fetch_contacts : Private { my $contacts = $c->stash->{body}->contacts->search(undef, { order_by => [ 'category' ] } ); $c->stash->{contacts} = $contacts; - $c->stash->{live_contacts} = $contacts->not_deleted; + $c->stash->{live_contacts} = $contacts->not_deleted_admin; $c->stash->{any_not_confirmed} = $contacts->search({ state => 'unconfirmed' })->count; if ( $c->get_param('text') && $c->get_param('text') eq '1' ) { diff --git a/perllib/FixMyStreet/DB/ResultSet/Contact.pm b/perllib/FixMyStreet/DB/ResultSet/Contact.pm index eb502c190..f8f182e05 100644 --- a/perllib/FixMyStreet/DB/ResultSet/Contact.pm +++ b/perllib/FixMyStreet/DB/ResultSet/Contact.pm @@ -20,6 +20,11 @@ sub not_deleted { return $rs->search( { $rs->me('state') => { -not_in => [ 'deleted', 'staff' ] } } ); } +sub not_deleted_admin { + my $rs = shift; + return $rs->search( { $rs->me('state') => { -not_in => [ 'deleted' ] } } ); +} + sub active { my $rs = shift; $rs->search( { $rs->me('state') => [ 'unconfirmed', 'confirmed' ] } ); diff --git a/perllib/FixMyStreet/SendReport.pm b/perllib/FixMyStreet/SendReport.pm index b869299a2..c73cbb918 100644 --- a/perllib/FixMyStreet/SendReport.pm +++ b/perllib/FixMyStreet/SendReport.pm @@ -63,7 +63,7 @@ sub add_body { sub fetch_category { my ($self, $body, $row, $category_override) = @_; - my $contact = $row->result_source->schema->resultset("Contact")->not_deleted->find( { + my $contact = $row->result_source->schema->resultset("Contact")->find( { body_id => $body->id, category => $category_override || $row->category, } ); |