Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses

1 files changed, 7 insertions, 1 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 5c73af26a..abc454600 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -331,7 +331,7 @@ sub display_contacts : Private {
 
     if ( $c->req->param('text') && $c->req->param('text') == 1 ) {
         $c->stash->{template} = 'admin/council_contacts.txt';
-        $c->res->content_encoding('text/plain');
+        $c->res->content_type('text/plain; charset=utf-8');
         return 1;
     }
 
@@ -356,6 +356,12 @@ sub setup_council_details : Private {
     return 1;
 }
 
+sub council_edit_all : Path('council_edit') {
+    my ( $self, $c, $area_id, @category ) = @_;
+    my $category = join( '/', @category );
+    $c->go( 'council_edit', [ $area_id, $category ] );
+}
+
 sub council_edit : Path('council_edit') : Args(2) {
     my ( $self, $c, $area_id, $category ) = @_;