11 files changed, 14 insertions, 14 deletions
diff --git a/templates/web/default/admin/list_updates.html b/templates/web/default/admin/list_updates.html
index 33b53770f..d09205380 100644
--- a/templates/web/default/admin/list_updates.html
+++ b/templates/web/default/admin/list_updates.html
@@ -29,7 +29,7 @@
         <td>[% PROCESS format_time time=update.created %]</td> 
         <td>[% IF update.anonymous %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> 
         <td>[% IF update.user.id == update.problem.user_id %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td>
-        <td>[% IF update.user.belongs_to_body( update.problem.council ) %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td>
+        <td>[% IF update.user.belongs_to_body( update.problem.bodies_str ) %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td>
         <td>[% update.cobrand %]<br>[% update.cobrand_data | html %]</td> 
         <td>[% update.text | html %]</td> 
         <td><a href="[% c.uri_for( 'update_edit', update.id ) %]">[% loc('Edit') %]</a></td>
diff --git a/templates/web/default/admin/problem_row.html b/templates/web/default/admin/problem_row.html
index 22825429a..ce95f8078 100644
--- a/templates/web/default/admin/problem_row.html
+++ b/templates/web/default/admin/problem_row.html
@@ -11,9 +11,9 @@
         <td>[% PROCESS value_or_nbsp value=problem.name %]</td> 
         <td>[% PROCESS value_or_nbsp value=problem.user.email %]</td> 
         <td>[%- IF edit_council_contacts -%]
-        <a href="[% c.uri_for('council_contacts', problem.council ) %]">[% PROCESS value_or_nbsp value=problem.council %]</a>
+        <a href="[% c.uri_for('council_contacts', problem.bodies_str ) %]">[% PROCESS value_or_nbsp value=problem.bodies_str %]</a>
         [%- ELSE -%]
-            [%- PROCESS value_or_nbsp value=problem.council -%]
+            [%- PROCESS value_or_nbsp value=problem.bodies_str -%]
         [%- END -%]</td>
         <td>[% PROCESS value_or_nbsp value=problem.category %]</td> 
         <td>[% IF problem.anonymous %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> 
diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html
index ea98a9be9..9cd2c1d8c 100644
--- a/templates/web/default/admin/report_edit.html
+++ b/templates/web/default/admin/report_edit.html
@@ -13,7 +13,7 @@
 <li><label for='title'>[% loc('Subject:') %]</label> <input size=60 type='text' id='title' name='title' value='[% problem.title | html %]'></li>
 <li><label for='detail'>[% loc('Details:') %]</label><br><textarea name='detail' id='detail' cols=60 rows=10>[% problem.detail | html %]</textarea></li>
 <li>[% loc('Co-ordinates:') %] [% problem.latitude %], [% problem.longitude %] ( [% loc('originally entered') %] [% problem.postcode | html %] , [% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li>
-<li>[% loc('For council(s):') %] [% IF problem.council %][% problem.council %][% ELSE %]<em>[% loc('None' ) %]</em>[% END %] ([% loc('other areas:') %] [% problem.areas | remove('^,') | remove( ',$' ) %])</li>
+<li>[% loc('For council(s):') %] [% IF problem.bodies_str %][% problem.bodies_str %][% ELSE %]<em>[% loc('None' ) %]</em>[% END %] ([% loc('other areas:') %] [% problem.areas | remove('^,') | remove( ',$' ) %])</li>
 <li><label for="state">[% loc('State:') %]</label> <select name="state"  id="state">
     [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
     loc('Investigating')], ['planned', loc('Planned')], ['in progress',
diff --git a/templates/web/default/admin/timeline.html b/templates/web/default/admin/timeline.html
index 95120e48c..db6ff83ef 100644
--- a/templates/web/default/admin/timeline.html
+++ b/templates/web/default/admin/timeline.html
@@ -25,7 +25,7 @@
             [% CASE 'problemConfirmed' %]
                 [%- tprintf( loc('Problem %s confirmed'), '<a href="' _ c.uri_for_email( '/report', item.obj.id, c.cobrand_data ) _ '">' _ item.obj.id _ '</a>') %]; [% PROCESS problem_name problem=item.obj -%]
             [% CASE 'problemSent' %]
-                [% tprintf(loc("Problem %s sent to council %s"), '<a href="' _ c.uri_for_email( '/report', item.obj.id, c.cobrand_data ) _ '">' _ item.obj.id _ '</a>', item.obj.council ) %]
+                [% tprintf(loc("Problem %s sent to council %s"), '<a href="' _ c.uri_for_email( '/report', item.obj.id, c.cobrand_data ) _ '">' _ item.obj.id _ '</a>', item.obj.bodies_str ) %]
             [% CASE 'quesSent' %]
                 [% tprintf(loc("Questionnaire %d sent for problem %d"), item.obj.id, item.obj.problem_id ) %]
             [% CASE 'quesAnswered' %]
diff --git a/templates/web/default/admin/update_edit.html b/templates/web/default/admin/update_edit.html
index b56ceeae3..c0db82f28 100644
--- a/templates/web/default/admin/update_edit.html
+++ b/templates/web/default/admin/update_edit.html
@@ -22,7 +22,7 @@
 </select></li>
 <li>[% loc('Name:') %] <input type='text' name='name' id='name' value='[% update.name | html %]'></li>
 <li>[% loc('Email:') %] <input type='text' id='email' name='email' value='[% update.user.email | html %]'>
-[%- IF update.user.from_body && update.user.from_body == update.problem.council %]
+[%- IF update.user.from_body && update.user.from_body == update.problem.bodies_str %]
 [% ' (' _ tprintf(loc('user is from same council as problem - %d'), update.user.from_body ) _')' %]
 [% END -%]
 [%- IF update.user.id == update.problem.user.id %]
diff --git a/templates/web/default/questionnaire/completed.html b/templates/web/default/questionnaire/completed.html
index 52c20652c..4d848a63c 100644
--- a/templates/web/default/questionnaire/completed.html
+++ b/templates/web/default/questionnaire/completed.html
@@ -22,7 +22,7 @@ site and leave an update.</p>') %]
 [% END %]
 
 [% IF advert_outcome %]
-    [% display_crosssell_advert( problem.user.email, problem.name, 'council', problem.council ) %]
+    [% display_crosssell_advert( problem.user.email, problem.name, 'council', problem.bodies_str ) %]
 [% END %]
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/report/_main.html b/templates/web/default/report/_main.html
index b9779db69..9b637b83c 100644
--- a/templates/web/default/report/_main.html
+++ b/templates/web/default/report/_main.html
@@ -4,7 +4,7 @@
     <p><em>
     [% problem.meta_line(c) | html %]
     [%- IF !problem.used_map %]; <strong>[% loc('there is no pin shown as the user did not use the map') %]</strong>[% END %]
-    [% IF problem.council %]
+    [% IF problem.bodies_str %]
         [% IF problem.whensent || problem.can_display_external_id %]
             <small class="council_sent_info"><br>
                 [% problem.processed_summary_string(c) %]
diff --git a/templates/web/default/report/new/fill_in_details_form.html b/templates/web/default/report/new/fill_in_details_form.html
index 9c9451914..4af0baccd 100644
--- a/templates/web/default/report/new/fill_in_details_form.html
+++ b/templates/web/default/report/new/fill_in_details_form.html
@@ -40,8 +40,8 @@
 
 
 
-[% IF field_errors.council %]
-    <div class='form-error'>[% field_errors.council %]</div>
+[% IF field_errors.bodies %]
+    <div class='form-error'>[% field_errors.bodies %]</div>
 [% END %]
 
 [% IF field_errors.title %]
diff --git a/templates/web/default/report/update-form.html b/templates/web/default/report/update-form.html
index 48eb60fcb..957fc9947 100644
--- a/templates/web/default/report/update-form.html
+++ b/templates/web/default/report/update-form.html
@@ -23,7 +23,7 @@
             <textarea name="update" id="form_update" rows="7" cols="30" required>[% update.text | html %]</textarea>
         </div>
 
-        [% IF c.user && c.user.belongs_to_body( problem.council ) %]
+        [% IF c.user && c.user.belongs_to_body( problem.bodies_str ) %]
         <div class="form-field">
             <label for="form_state">[% loc( 'State:' ) %]</label>
             <select name="state" id="form_state">
diff --git a/templates/web/default/reports/_list-entry.html b/templates/web/default/reports/_list-entry.html
index 14863c4a1..fa7dcee7b 100755
--- a/templates/web/default/reports/_list-entry.html
+++ b/templates/web/default/reports/_list-entry.html
@@ -1,6 +1,6 @@
 <li><a href="[% c.uri_for('/report/' _ problem.id) %]">[% problem.title | html %]</a>
-    [% IF problem.councils > 1 %] <small>[% loc('(sent to both)') %]</small> [% END %]
+    [% IF problem.bodies > 1 %] <small>[% loc('(sent to both)') %]</small> [% END %]
     [% IF c.cobrand.moniker != 'emptyhomes' %]
-        [% IF problem.councils == 0 %] <small>[% loc('(not sent to council)') %]</small> [% END %]
+        [% IF problem.bodies == 0 %] <small>[% loc('(not sent to council)') %]</small> [% END %]
     [% END %]
 </li>
diff --git a/templates/web/default/tokens/confirm_problem.html b/templates/web/default/tokens/confirm_problem.html
index b6d82968f..b44214c8b 100644
--- a/templates/web/default/tokens/confirm_problem.html
+++ b/templates/web/default/tokens/confirm_problem.html
@@ -14,7 +14,7 @@ You can <a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]
 [%    
     loc('You have successfully confirmed your problem');
 
-    IF problem.council;
+    IF problem.bodies_str;
         loc(' and <strong>we will now send it to the council</strong>');
     END;