diff options
Diffstat (limited to 'perllib/FixMyStreet/App')
-rw-r--r-- | perllib/FixMyStreet/App/Controller/Admin.pm | 2 | ||||
-rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/New.pm | 7 | ||||
-rw-r--r-- | perllib/FixMyStreet/App/View/Web.pm | 7 |
3 files changed, 2 insertions, 14 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 579ee9b41..b76447233 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -73,7 +73,7 @@ sub index : Path : Args(0) { $c->stash->{alerts} = \%alert_counts; - my $contacts = $c->model('DB::Contact')->summary_count; + my $contacts = $c->model('DB::Contact')->summary_count( $c->cobrand->contact_restriction ); my %contact_counts = map { $_->confirmed => $_->get_column('confirmed_count') } $contacts->all; diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index c14b7e9b1..5c52d0257 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -118,13 +118,6 @@ sub report_import : Path('/import') { # anything else we return is plain text $c->res->content_type('text/plain; charset=utf-8'); - # use strict; - # use Standard; - # use mySociety::AuthToken; - # use mySociety::Config; - # use mySociety::EvEl; - # use mySociety::Locale; - my %input = map { $_ => $c->req->param($_) || '' } ( 'service', 'subject', 'detail', 'name', 'email', 'phone', diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm index 5b20e286b..358e280c3 100644 --- a/perllib/FixMyStreet/App/View/Web.pm +++ b/perllib/FixMyStreet/App/View/Web.pm @@ -84,12 +84,7 @@ sub display_crosssell_advert { my ( $self, $c, $email, $name, %data ) = @_; return unless $c->cobrand->allow_crosssell_adverts(); - - # fake up the old style $q - my $q = { site => $c->cobrand->moniker, }; - $q->{site} = 'fixmystreet' if $q->{site} eq 'default'; - - return CrossSell::display_advert( $q, $email, $name, %data ); + return CrossSell::display_advert( $c, $email, $name, %data ); } =head2 Utils::prettify_epoch |