aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2019-07-15 10:06:31 +0100
committerMatthew Somerville <matthew@mysociety.org>2019-07-16 10:20:40 +0100
commiteca03317b9c26af2a4bf8de1b1058b45445b6fc7 (patch)
tree917e1e61e940f7bee2d18b19d241bccc75ce94f0 /perllib/FixMyStreet
parentfcc46472c7abd45cdafd2c3bcb6bc673ebd300b5 (diff)
[UK] Allow multiple admin user domains.
Diffstat (limited to 'perllib/FixMyStreet')
-rw-r--r--perllib/FixMyStreet/Cobrand/Hounslow.pm2
-rw-r--r--perllib/FixMyStreet/Cobrand/UKCouncils.pm6
2 files changed, 5 insertions, 3 deletions
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);