3 files changed, 15 insertions, 12 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index acd6ddbf2..84651ad07 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -1647,7 +1647,7 @@ sub user_edit : Path('user_edit') : Args(1) {
         if (!$user->from_body) {
             # Non-staff users aren't allowed any permissions or to be in an area
             $user->admin_user_body_permissions->delete;
-            $user->area_id(undef);
+            $user->area_ids(undef);
             delete $c->stash->{areas};
             delete $c->stash->{fetched_areas_body_id};
         } elsif ($c->stash->{available_permissions}) {
@@ -1667,8 +1667,8 @@ sub user_edit : Path('user_edit') : Args(1) {
 
         if ( $user->from_body && $c->user->has_permission_to('user_assign_areas', $user->from_body->id) ) {
             my %valid_areas = map { $_->{id} => 1 } @{ $c->stash->{areas} };
-            my $new_area = $c->get_param('area_id');
-            $user->area_id( $valid_areas{$new_area} ? $new_area : undef );
+            my @area_ids = grep { $valid_areas{$_} } $c->get_param_list('area_ids');
+            $user->area_ids( @area_ids ? \@area_ids : undef );
         }
 
         # Handle 'trusted' flag(s)
diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index 7979f31f6..d597ff0ea 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -105,15 +105,18 @@ sub index : Path : Args(0) {
 
         # See if we've had anything from the body dropdowns
         $c->stash->{category} = $c->get_param('category');
-        $c->stash->{ward} = $c->get_param('ward');
-        if ($c->user_exists && $c->user->area_id) {
-            $c->stash->{ward} = $c->user->area_id;
-            $c->stash->{body_name} = join "", map { $children->{$_}->{name} } grep { $children->{$_} } $c->user->area_id;
+        $c->stash->{ward} = [ $c->get_param_list('ward') ];
+        if ($c->user_exists) {
+            if (my @areas = @{$c->user->area_ids || []}) {
+                $c->stash->{ward} = $c->user->area_ids;
+                $c->stash->{body_name} = join " / ", sort map { $children->{$_}->{name} } grep { $children->{$_} } @areas;
+            }
         }
     } else {
         my @bodies = $c->model('DB::Body')->search(undef, {
             columns => [ "id", "name" ],
         })->active->translated->with_area_count->all_sorted;
+        $c->stash->{ward} = [];
         $c->stash->{bodies} = \@bodies;
     }
 
@@ -142,8 +145,8 @@ sub construct_rs_filter : Private {
     my ($self, $c, $updates) = @_;
 
     my %where;
-    $where{areas} = { 'like', '%,' . $c->stash->{ward} . ',%' }
-        if $c->stash->{ward};
+    $where{areas} = [ map { { 'like', "%,$_,%" } } @{$c->stash->{ward}} ]
+        if @{$c->stash->{ward}};
     $where{category} = $c->stash->{category}
         if $c->stash->{category};
 
@@ -298,7 +301,7 @@ sub csv_filename {
     my %where = (
         category => $c->stash->{category},
         state => $c->stash->{q_state},
-        ward => $c->stash->{ward},
+        ward => join(',', @{$c->stash->{ward}}),
     );
     $where{body} = $c->stash->{body}->id if $c->stash->{body};
     join '-',
@@ -475,7 +478,7 @@ sub generate_csv : Private {
 
     my $filename = $c->stash->{csv}->{filename};
     $c->res->content_type('text/csv; charset=utf-8');
-    $c->res->header('content-disposition' => "attachment; filename=${filename}.csv");
+    $c->res->header('content-disposition' => "attachment; filename=\"${filename}.csv\"");
     $c->res->body( join "", @body );
 }
 
diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index 975b2fdd5..4c28563de 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -450,7 +450,7 @@ sub summary : Private {
 
     # required to stop errors in generate_grouped_data
     $c->stash->{q_state} = '';
-    $c->stash->{ward} = $c->get_param('area');
+    $c->stash->{ward} = [ $c->get_param('area') || () ];
     $c->stash->{start_date} = $dtf->format_date($start_date);
     $c->stash->{end_date} = $c->get_param('end_date');