aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2019-01-31 16:30:14 +0000
committerMatthew Somerville <matthew-github@dracos.co.uk>2019-01-31 16:30:14 +0000
commit113ddf4615c434f2da598a7c31d70e4dae53017b (patch)
treec7ae9f2ba012a08388f4b3e6320a1c1774cab313
parentb5cc0b4b866f576dc52587d9e993a221d476ef65 (diff)
[UK Councils] Get topic when reporting abuse.
-rw-r--r--perllib/FixMyStreet/Cobrand/Buckinghamshire.pm20
-rw-r--r--perllib/FixMyStreet/Cobrand/UKCouncils.pm20
-rw-r--r--templates/web/fixmystreet-uk-councils/contact/who.html (renamed from templates/web/buckinghamshire/contact/who.html)0
3 files changed, 20 insertions, 20 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
index a96b2b616..ef9848f79 100644
--- a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
@@ -438,24 +438,4 @@ sub lookup_site_code_config { {
}
} }
-sub extra_contact_validation {
- my $self = shift;
- my $c = shift;
-
- # Don't care about dest unless reporting abuse
- return () unless $c->stash->{problem};
-
- my %errors;
-
- $c->stash->{dest} = $c->get_param('dest');
-
- if (!$c->get_param('dest')) {
- $errors{dest} = "Please enter a topic of your message";
- } elsif ( $c->get_param('dest') eq 'council' || $c->get_param('dest') eq 'update' ) {
- $errors{not_for_us} = 1;
- }
-
- return %errors;
-}
-
1;
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index 7eb63a371..ab3d8f91b 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -306,6 +306,26 @@ sub lookup_site_code {
return $site_code;
}
+sub extra_contact_validation {
+ my $self = shift;
+ my $c = shift;
+
+ # Don't care about dest unless reporting abuse
+ return () unless $c->stash->{problem};
+
+ my %errors;
+
+ $c->stash->{dest} = $c->get_param('dest');
+
+ if (!$c->get_param('dest')) {
+ $errors{dest} = "Please enter a topic of your message";
+ } elsif ( $c->get_param('dest') eq 'council' || $c->get_param('dest') eq 'update' ) {
+ $errors{not_for_us} = 1;
+ }
+
+ return %errors;
+}
+
=head2 _distance
diff --git a/templates/web/buckinghamshire/contact/who.html b/templates/web/fixmystreet-uk-councils/contact/who.html
index e3b045521..e3b045521 100644
--- a/templates/web/buckinghamshire/contact/who.html
+++ b/templates/web/fixmystreet-uk-councils/contact/who.html