Merge branch 'open311-improvements'

1 files changed, 8 insertions, 3 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 696234d32..110d268d7 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -226,7 +226,6 @@ sub category_extras_ajax : Path('category_extras') : Args(0) {
     my $category_extra = '';
     my $generate;
     if ( $c->stash->{category_extras}->{$category} && @{ $c->stash->{category_extras}->{$category} } >= 1 ) {
-        $c->stash->{report_meta} = {};
         $c->stash->{category_extras} = { $category => $c->stash->{category_extras}->{$category} };
         $generate = 1;
     }
@@ -641,8 +640,14 @@ sub setup_categories_and_bodies : Private {
             push @category_options, $contact->category;
 
             my $metas = $contact->get_extra_fields;
-            $category_extras{ $contact->category } = $metas
-                if scalar @$metas;
+            if (scalar @$metas) {
+                foreach (@$metas) {
+                    if ($_->{values} && $_->{values}->{value}) {
+                        $_->{values} = [ map { { name => $_->{name}[0], key => $_->{key}[0] } } @{$_->{values}->{value}} ];
+                    }
+                }
+                $category_extras{ $contact->category } = $metas;
+            }
 
             my $body_send_method = $bodies{$contact->body_id}->send_method || '';
             $c->stash->{unresponsive}{$contact->category} = $contact->body_id