Merge branch 'issues/forcouncils/127-exor-rdi-csv-output'

2 files changed, 18 insertions, 16 deletions

diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 97cb28fe8..d78eda78f 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -613,9 +613,7 @@ sub meta_line {
     my $meta = '';
 
     my $category = $problem->category;
-    if ($c->cobrand->can('change_category_text')) {
-        $category = $c->cobrand->change_category_text($category);
-    }
+    $category = $c->cobrand->call_hook(change_category_text => $category) || $category;
 
     if ( $problem->anonymous ) {
         if ( $problem->service and $category && $category ne _('Other') ) {
@@ -748,17 +746,10 @@ sub can_display_external_id {
 
 sub duration_string {
     my ( $problem, $c ) = @_;
-    my $body;
-    if ( $c->cobrand->can('link_to_council_cobrand') ) {
-        $body = $c->cobrand->link_to_council_cobrand($problem);
-    } else {
-        $body = $problem->body( $c );
-    }
-    if ( $c->cobrand->can('get_body_handler_for_problem') ) {
-        my $handler = $c->cobrand->get_body_handler_for_problem( $problem );
-        if ( $handler->can('is_council_with_case_management') && $handler->is_council_with_case_management ) {
-            return sprintf(_('Received by %s moments later'), $body);
-        }
+    my $body = $c->cobrand->call_hook(link_to_council_cobrand => $problem) || $problem->body($c);
+    my $handler = $c->cobrand->call_hook(get_body_handler_for_problem => $problem);
+    if ( $handler && $handler->call_hook('is_council_with_case_management') ) {
+        return sprintf(_('Received by %s moments later'), $body);
     }
     return unless $problem->whensent;
     return sprintf(_('Sent to %s %s later'), $body,
@@ -1109,4 +1100,13 @@ has traffic_management_options => (
     },
 );
 
+has inspection_log_entry => (
+    is => 'ro',
+    lazy => 1,
+    default => sub {
+        my $self = shift;
+        return $self->admin_log_entries->search({ action => 'inspected' }, { order_by => { -desc => 'whenedited' } })->first;
+    },
+);
+
 1;
diff --git a/perllib/FixMyStreet/DB/Result/ResponsePriority.pm b/perllib/FixMyStreet/DB/Result/ResponsePriority.pm
index 6bc8474fa..44635d174 100644
--- a/perllib/FixMyStreet/DB/Result/ResponsePriority.pm
+++ b/perllib/FixMyStreet/DB/Result/ResponsePriority.pm
@@ -26,6 +26,8 @@ __PACKAGE__->add_columns(
   { data_type => "boolean", default_value => \"false", is_nullable => 0 },
   "description",
   { data_type => "text", is_nullable => 1 },
+  "external_id",
+  { data_type => "text", is_nullable => 1 },
 );
 __PACKAGE__->set_primary_key("id");
 __PACKAGE__->add_unique_constraint("response_priorities_body_id_name_key", ["body_id", "name"]);
@@ -49,8 +51,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07035 @ 2016-10-17 16:37:28
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:wok3cPA7cPjG4e9lnc1PIg
+# Created by DBIx::Class::Schema::Loader v0.07035 @ 2016-12-14 17:12:09
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:glsO0fLK6fNvg4TmW1DMPg
 
 __PACKAGE__->many_to_many( contacts => 'contact_response_priorities', 'contact' );