From cfb0dd09a7be10d6443995930cbb8739f4d1ecc7 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 11 Dec 2018 16:26:16 +0000
Subject: [fixmystreet.com] Get topic when reporting abuse.

---
 perllib/FixMyStreet/Cobrand/FixMyStreet.pm     |  3 ---
 templates/web/fixmystreet.com/contact/who.html | 18 +++++++++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index b2fc5ba83..fb454f495 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -52,9 +52,6 @@ sub extra_contact_validation {
     my $self = shift;
     my $c = shift;
 
-    # Don't care about dest if reporting abuse
-    return () if $c->stash->{problem};
-
     my %errors;
 
     $c->stash->{dest} = $c->get_param('dest');
diff --git a/templates/web/fixmystreet.com/contact/who.html b/templates/web/fixmystreet.com/contact/who.html
index a683412b7..996ceeca7 100644
--- a/templates/web/fixmystreet.com/contact/who.html
+++ b/templates/web/fixmystreet.com/contact/who.html
@@ -1,10 +1,23 @@
-[% IF NOT problem %]
 <h4>Topic:</h4>
 
 [% IF field_errors.dest %]
 <div class="form-error">[% field_errors.dest %]</div>
 [% END %]
 
+[% IF problem %]
+<div class="checkbox-group">
+    <input name="dest" id="dest_rules" type="radio" value="rules" class="required"[% IF dest AND dest == 'rules' %] checked[% END %]>
+    <label class="inline" for="dest_rules">This [% update ? 'update' : 'report' %] breaks the <a href="/about/house-rules">House Rules</a></label>
+</div>
+<div class="checkbox-group">
+    <input name="dest" id="dest_update" type="radio" value="update" class="required"[% IF dest AND dest == 'update' %] checked[% END %]>
+    <label class="inline" for="dest_update">This report has not been fixed</label>
+</div>
+<div class="checkbox-group">
+    <input name="dest" id="dest_council" type="radio" value="council" class="required"[% IF dest AND dest == 'council' %] checked[% END %]>
+    <label class="inline" for="dest_council">I want to make a new report about a street problem</label>
+</div>
+[% ELSE %]
 <div class="checkbox-group">
     <input name="dest" id="dest_help" type="radio" value="help" class="required"[% IF dest AND dest == 'help' %] checked[% END %]>
     <label class="inline" for="dest_help">I need help using the site</label>
@@ -29,6 +42,7 @@
     <input name="dest" id="dest_update" type="radio" value="update"[% IF dest AND dest == 'update' %] checked[% END %]>
     <label class="inline" for="dest_update">My street problem hasn't been fixed</label>
 </div>
+[% END %]
 
 <div id="dest-error"[% IF NOT field_errors.not_for_us %] class="hidden"[% END %]>
   <div class="form-error">You can only contact the team behind FixMyStreet using our contact form</div>
@@ -77,5 +91,3 @@
     </p>
   </div>
 </div>
-
-[% END %]
-- 
cgit v1.2.3