Merge remote branch 'origin/zurich'

Conflicts:
	bin/open311-populate-service-list
	bin/send-comments
	bin/update-all-reports
	conf/crontab.ugly
	db/schema.sql
	perllib/FixMyStreet/App/Controller/Admin.pm
	perllib/FixMyStreet/App/Controller/Report/New.pm
	perllib/FixMyStreet/App/Controller/Reports.pm
	perllib/FixMyStreet/Cobrand/Default.pm
	perllib/FixMyStreet/Cobrand/LichfieldDC.pm
	perllib/FixMyStreet/DB/Result/Open311conf.pm
	perllib/FixMyStreet/DB/Result/Problem.pm
	perllib/FixMyStreet/DB/ResultSet/Problem.pm
	perllib/FixMyStreet/SendReport.pm
	perllib/FixMyStreet/SendReport/Email.pm
	perllib/FixMyStreet/SendReport/Open311.pm
	perllib/Open311/GetServiceRequestUpdates.pm
	perllib/Open311/PopulateServiceList.pm
	t/app/controller/report_new.t
	t/app/controller/rss.t
	templates/web/bromley/report/display.html
	templates/web/default/admin/council_contacts.html
	templates/web/default/common_header_tags.html
	templates/web/default/dashboard/index.html
	templates/web/default/front/stats.html
	templates/web/default/report/_main.html
	templates/web/default/report/update-form.html
	templates/web/emptyhomes/index.html
	templates/web/emptyhomes/report/display.html
	templates/web/emptyhomes/report/new/councils_text_all.html
	templates/web/emptyhomes/reports/body.html
	templates/web/emptyhomes/reports/index.html
	templates/web/fixmystreet/report/new/fill_in_details_form.html
	templates/web/fixmystreet/report/update-form.html
	web/cobrands/fixmystreet/fixmystreet.js
	web/js/fixmystreet.js

1 files changed, 46 insertions, 32 deletions

diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index 040790184..a92e3b079 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -44,7 +44,7 @@ for my $test (
         errors => {
             title => 'Please enter a subject',
             detail => 'Please enter some details',
-            council => 'No council selected',
+            bodies => 'No council selected',
             name => 'Please enter your name',
         }
     },
@@ -56,7 +56,7 @@ for my $test (
         errors => {
             title => 'Please enter a subject',
             detail => 'Please enter some details',
-            council => 'No council selected',
+            bodies => 'No council selected',
             name => 'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below',
         }
     },
@@ -68,7 +68,7 @@ for my $test (
         errors => {
             title => 'Please enter a subject',
             detail => 'Please enter some details',
-            council => 'No council selected',
+            bodies => 'No council selected',
             name => 'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below',
         }
     },
@@ -80,7 +80,7 @@ for my $test (
         errors => {
             title => 'Please enter a subject',
             detail => 'Please enter some details',
-            council => 'No council selected',
+            bodies => 'No council selected',
         }
     },
     {
@@ -90,7 +90,7 @@ for my $test (
         },
         errors => {
             detail => 'Please enter some details',
-            council => 'No council selected',
+            bodies => 'No council selected',
         }
     },
     {
@@ -99,22 +99,22 @@ for my $test (
             detail => 'Some information about the problem',
         },
         errors => {
-            council => 'No council selected',
+            bodies => 'No council selected',
         }
     },
     {
-        desc => 'incorrectly formatted council',
+        desc => 'incorrectly formatted body',
         changed => {
-            council => 'my council',
+            bodies_str => 'my body',
         },
         errors => {
-            council => 'No council selected',
+            bodies => 'No council selected',
         }
     },
     {
-        desc => 'correctly formatted council',
+        desc => 'correctly formatted body',
         changed => {
-            council => '1001',
+            bodies_str => '1001',
         },
         errors => {
         }
@@ -383,42 +383,56 @@ my %contact_params = (
     whenedited => \'ms_current_timestamp()',
     note => 'Created for test',
 );
+
+for my $body (
+    { id => 2651, name => 'City of Edinburgh Council' },
+    { id => 2226, name => 'Gloucestershire County Council' },
+    { id => 2326, name => 'Cheltenham Borough Council' },
+    { id => 2434, name => 'Lichfield District Council' },
+    { id => 2240, name => 'Staffordshire County Council' },
+    { id => 14279, name => 'Ballymoney Borough Council' },
+    { id => 2636, name => 'Isle of Wight Council' },
+    { id => 2649, name => 'Fife Council' },
+) {
+    $mech->create_body_ok($body->{id}, $body->{name});
+}
+
 # Let's make some contacts to send things to!
 FixMyStreet::App->model('DB::Contact')->search( {
     email => { 'like', '%example.com' },
 } )->delete;
 my @contacts;
 for my $contact ( {
-    area_id => 2651, # Edinburgh
+    body_id => 2651, # Edinburgh
     category => 'potholes',
     email => 'test@example.org',
 }, {
-    area_id => 2226, # Gloucestershire
+    body_id => 2226, # Gloucestershire
     category => 'potholes',
     email => '2226@example.org',
 }, {
-    area_id => 2326, # Cheltenham
+    body_id => 2326, # Cheltenham
     category => 'potholes',
     email => '2326@example.org',
 }, {
-    area_id => 2434, # Lichfield
+    body_id => 2434, # Lichfield
     category => 'potholes',
     email => 'trees@example.com',
 }, {
-    area_id => 2240, # Staffordshire
+    body_id => 2240, # Staffordshire
     category => 'potholes',
     email => 'highways@example.com',
 }, {
-    area_id => 14279, # Ballymoney
+    body_id => 14279, # Ballymoney
     category => 'Street lighting',
     email => 'roads.western@drdni.example.org',
 }, {
-    area_id => 14279, # Ballymoney
+    body_id => 14279, # Ballymoney
     category => 'Graffiti',
     email => 'highways@example.com',
 }, {
     confirmed => 0,
-    area_id => 2636, # Isle of Wight
+    body_id => 2636, # Isle of Wight
     category => 'potholes',
     email => '2636@example.com',
 } ) {
@@ -438,13 +452,13 @@ foreach my $test ( {
         email_count   => 1,
         dear          => qr'Dear City of Edinburgh Council',
         to            => qr'City of Edinburgh Council',
-        council       => 2651,
+        body          => 2651,
     }, {
         %common,
         desc          => 'no email sent if no unsent problems',
         unset_whendef => 0,
         email_count   => 0,
-        council       => 2651,
+        body          => 2651,
     }, {
         %common,
         desc          => 'email to two tier council',
@@ -452,7 +466,7 @@ foreach my $test ( {
         email_count   => 1,
         to            => qr'Gloucestershire County Council.*Cheltenham Borough Council',
         dear          => qr'Dear Gloucestershire County Council and Cheltenham Borough',
-        council       => '2226,2326',
+        body          => '2226,2326',
         multiple      => 1,
     }, {
         %common,
@@ -461,7 +475,7 @@ foreach my $test ( {
         email_count   => 1,
         to            => qr'Gloucestershire County Council" <2226@example',
         dear          => qr'Dear Gloucestershire County Council,',
-        council       => '2226|2649',
+        body          => '2226|2649',
         missing       => qr'problem might be the responsibility of Fife.*Council'ms,
     }, {
         %common,
@@ -470,7 +484,7 @@ foreach my $test ( {
         email_count   => 1,
         to            => qr'Lichfield District Council',
         dear          => qr'Dear Lichfield District Council,',
-        council       => '2434',
+        body          => '2434',
         cobrand       => 'lichfielddc',
         url           => 'lichfielddc.',
     }, {
@@ -480,7 +494,7 @@ foreach my $test ( {
         email_count   => 1,
         to            => qr'Staffordshire County Council" <highways@example',
         dear          => qr'Dear Staffordshire County Council,',
-        council       => '2240',
+        body          => '2240',
         cobrand       => 'lichfielddc',
         url           => '',
     }, {
@@ -490,7 +504,7 @@ foreach my $test ( {
         email_count   => 1,
         dear          => qr'Dear Ballymoney Borough Council',
         to            => qr'Ballymoney Borough Council',
-        council       => 14279,
+        body          => 14279,
         category      => 'Graffiti',
     }, {
         %common,
@@ -499,7 +513,7 @@ foreach my $test ( {
         email_count   => 1,
         dear          => qr'Dear Roads Service \(Western\)',
         to            => qr'Roads Service \(Western\)" <roads',
-        council       => 14279,
+        body          => 14279,
         category      => 'Street lighting',
     }, {
         %common,
@@ -507,7 +521,7 @@ foreach my $test ( {
         unset_whendef => 1,
         stays_unsent  => 1,
         email_count   => 0,
-        council       => 2636,
+        body          => 2636,
     },
 ) {
     subtest $test->{ desc } => sub {
@@ -525,7 +539,7 @@ foreach my $test ( {
 
         $problem->discard_changes;
         $problem->update( {
-            council => $test->{ council },
+            bodies_str => $test->{ body },
             state => 'confirmed',
             confirmed => \'ms_current_timestamp()',
             whensent => $test->{ unset_whendef } ? undef : \'ms_current_timestamp()',
@@ -547,9 +561,9 @@ foreach my $test ( {
             like $email->body, $test->{ dear }, 'Salutation looks correct';
 
             if ( $test->{multiple} ) {
-                like $email->body, qr/This email has been sent to several councils /, 'multiple council text correct';
+                like $email->body, qr/This email has been sent to several councils /, 'multiple body text correct';
             } elsif ( $test->{ missing } ) {
-                like $email->body, $test->{ missing }, 'missing council information correct';
+                like $email->body, $test->{ missing }, 'missing body information correct';
             }
 
             if ( $test->{url} ) {
@@ -617,7 +631,7 @@ subtest 'check can turn on report sent email alerts' => sub {
 
 $problem->comments->delete;
 $problem->delete;
-$user->delete;
+$mech->delete_user( $user );
 
 foreach (@contacts) {
     $_->delete;