diff options
Diffstat (limited to 'perllib')
-rw-r--r-- | perllib/FixMyStreet/Cobrand/BathNES.pm | 12 | ||||
-rw-r--r-- | perllib/FixMyStreet/Cobrand/Hounslow.pm | 2 | ||||
-rw-r--r-- | perllib/FixMyStreet/Cobrand/UKCouncils.pm | 6 |
3 files changed, 5 insertions, 15 deletions
diff --git a/perllib/FixMyStreet/Cobrand/BathNES.pm b/perllib/FixMyStreet/Cobrand/BathNES.pm index 05c91c8dd..b6014a276 100644 --- a/perllib/FixMyStreet/Cobrand/BathNES.pm +++ b/perllib/FixMyStreet/Cobrand/BathNES.pm @@ -76,18 +76,6 @@ sub send_questionnaires { 0 } sub default_map_zoom { 3 } -sub map_js_extra { - my $self = shift; - - my $c = $self->{c}; - return unless $c->user_exists; - - my $banes_user = $c->user->from_body && $c->user->from_body->areas->{$self->council_area_id}; - if ( $banes_user || $c->user->is_superuser ) { - return ['/cobrands/bathnes/staff.js']; - } -} - sub category_extra_hidden { my ($self, $meta) = @_; my $code = $meta->{code}; diff --git a/perllib/FixMyStreet/Cobrand/Hounslow.pm b/perllib/FixMyStreet/Cobrand/Hounslow.pm index 18063c4aa..93512f2b9 100644 --- a/perllib/FixMyStreet/Cobrand/Hounslow.pm +++ b/perllib/FixMyStreet/Cobrand/Hounslow.pm @@ -16,7 +16,7 @@ sub enter_postcode_text { return "Enter a Hounslow street name and area, or postcode"; } -sub admin_user_domain { 'hounslowhighways.org' } +sub admin_user_domain { ('hounslowhighways.org', 'hounslow.gov.uk') } sub disambiguate_location { my $self = shift; diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm index 1fe346e43..794c3dec6 100644 --- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm +++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm @@ -102,8 +102,10 @@ sub users_restriction { 'me.id' => [ { -in => $problem_user_ids }, { -in => $update_user_ids } ], ]; if ($self->can('admin_user_domain')) { - my $domain = $self->admin_user_domain; - push @$or_query, email => { ilike => "%\@$domain" }; + my @domains = $self->admin_user_domain; + @domains = map { { ilike => "%\@$_" } } @domains; + @domains = [ @domains ] if @domains > 1; + push @$or_query, email => @domains; } return $rs->search($or_query); |