1 files changed, 9 insertions, 19 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
index 117725273..f901c4e2f 100644
--- a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
@@ -45,16 +45,7 @@ sub send_questionnaires {
     return 0;
 }
 
-sub open311_pre_send {
-    my ($self, $row, $open311) = @_;
-
-    return unless $row->extra;
-    my $extra = $row->get_extra_fields;
-    if (@$extra) {
-        @$extra = grep { $_->{name} ne 'road-placement' } @$extra;
-        $row->set_extra_fields(@$extra);
-    }
-}
+sub open311_extra_data_exclude { [ 'road-placement' ] }
 
 sub open311_post_send {
     my ($self, $row, $h) = @_;
@@ -103,6 +94,7 @@ sub report_new_munge_before_insert {
     my ($self, $report) = @_;
 
     return unless $report->category eq 'Flytipping';
+    return unless $self->{c}->stash->{report}->to_body_named('Buckinghamshire');
 
     my $placement = $self->{c}->get_param('road-placement');
     return unless $placement && $placement eq 'off-road';
@@ -132,19 +124,17 @@ sub map_type { 'Buckinghamshire' }
 sub default_map_zoom { 3 }
 
 sub _dashboard_export_add_columns {
-    my $self = shift;
-    my $c = $self->{c};
+    my ($self, $csv) = @_;
 
-    push @{$c->stash->{csv}->{headers}}, "Staff User";
-    push @{$c->stash->{csv}->{columns}}, "staff_user";
+    $csv->add_csv_columns( staff_user => 'Staff User' );
 
     # All staff users, for contributed_by lookup
-    my @user_ids = $c->model('DB::User')->search(
+    my @user_ids = FixMyStreet::DB->resultset('User')->search(
         { from_body => $self->body->id },
         { columns => [ 'id', 'email', ] })->all;
     my %user_lookup = map { $_->id => $_->email } @user_ids;
 
-    $c->stash->{csv}->{extra_data} = sub {
+    $csv->csv_extra_data(sub {
         my $report = shift;
         my $staff_user = '';
         if (my $contributed_by = $report->get_extra_metadata('contributed_by')) {
@@ -153,15 +143,15 @@ sub _dashboard_export_add_columns {
         return {
             staff_user => $staff_user,
         };
-    };
+    });
 }
 
 sub dashboard_export_updates_add_columns {
-    shift->_dashboard_export_add_columns;
+    shift->_dashboard_export_add_columns(@_);
 }
 
 sub dashboard_export_problems_add_columns {
-    shift->_dashboard_export_add_columns;
+    shift->_dashboard_export_add_columns(@_);
 }
 
 # Enable adding/editing of parish councils in the admin