Merge branch 'stevenage-open311'

2 files changed, 12 insertions, 1 deletions

diff --git a/perllib/FixMyStreet/DB/Result/Contact.pm b/perllib/FixMyStreet/DB/Result/Contact.pm
index dab5432c6..58d8e58de 100644
--- a/perllib/FixMyStreet/DB/Result/Contact.pm
+++ b/perllib/FixMyStreet/DB/Result/Contact.pm
@@ -68,4 +68,15 @@ use namespace::clean -except => [ 'meta' ];
 
 with 'FixMyStreet::Roles::Extra';
 
+sub get_metadata_for_input {
+    my $self = shift;
+    my $id_field = $self->id_field;
+    return [ grep { $_->{code} !~ /^(easting|northing|$id_field)$/ } @{$self->get_extra_fields} ];
+}
+
+sub id_field {
+    my $self = shift;
+    return $self->get_extra_metadata('id_field') || 'fixmystreet_id';
+}
+
 1;
diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index 488030928..9ce7da1c0 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -235,7 +235,7 @@ sub categories_summary {
 sub send_reports {
     my ( $rs, $site_override ) = @_;
     require FixMyStreet::Script::Reports;
-    FixMyStreet::Script::Reports::send($site_override);
+    return FixMyStreet::Script::Reports::send($site_override);
 }
 
 1;