fixup! Add test

mysociety · Jun 1, 2022 · 4b77b1a · 4b77b1a
1 parent af5dc0d
commit 4b77b1a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 23 deletions.
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -374,9 +374,12 @@ sub public_asset_id {
     my $self = shift;
 
     my $current_cobrand = $self->result_source->schema->cobrand;
+
     my $cobrand_for_problem = $current_cobrand->call_hook(
         get_body_handler_for_problem => $self );
 
+    return unless $cobrand_for_problem;
+
     # Should be of the form:
     # COBRAND_FEATURES:
     #     public_asset_ids:

diff --git a/...web/base/report/_cobrand_ref_default.html → templates/web/base/report/_cobrand_ref.html b/...web/base/report/_cobrand_ref_default.html → templates/web/base/report/_cobrand_ref.html
diff --git a/templates/web/base/report/_main_after.html b/templates/web/base/report/_main_after.html
@@ -1,7 +1 @@
-[% IF problem.to_body_named('Oxfordshire') %]
-  [% IF problem.whensent %]
-    [% INCLUDE 'report/_cobrand_ref_oxfordshire.html' %]
-  [% END %]
-[% ELSE %]
-  [% INCLUDE 'report/_cobrand_ref_default.html' %]
-[% END %]
+[% INCLUDE 'report/_cobrand_ref.html' %]
diff --git a/...base/report/_cobrand_ref_oxfordshire.html → ....com/report/_cobrand_ref_oxfordshire.html b/...base/report/_cobrand_ref_oxfordshire.html → ....com/report/_cobrand_ref_oxfordshire.html
diff --git a/templates/web/fixmystreet.com/report/_main_after.html b/templates/web/fixmystreet.com/report/_main_after.html
@@ -0,0 +1,7 @@
+[% IF problem.to_body_named('Oxfordshire') %]
+  [% IF problem.whensent %]
+    [% INCLUDE 'report/_cobrand_ref_oxfordshire.html' %]
+  [% END %]
+[% ELSE %]
+  [% INCLUDE 'report/_cobrand_ref.html' %]
+[% END %]
diff --git a/templates/web/oxfordshire/report/_cobrand_ref.html b/templates/web/oxfordshire/report/_cobrand_ref.html
diff --git a/templates/web/oxfordshire/report/_cobrand_ref.html b/templates/web/oxfordshire/report/_cobrand_ref.html
@@ -0,0 +1 @@
+../../fixmystreet.com/report/_cobrand_ref_oxfordshire.html