fixup! [WW][Bulky][Sutton] Bulky update images available logged out

mysociety · Sep 27, 2024 · b209829 · b209829
1 parent 96fa4f0
commit b209829
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
@@ -623,7 +623,7 @@ FixMyStreet::override_config {
         my $comment = $report->comments->order_by('-id')->first;
         is $comment->photo, '74e3362283b6ef0c48686fb0e161da4043bbcc97.jpeg', 'photo added to comment';
         $mech->get_ok("/report/$report_id");
-        $mech->content_contains("/photo/temp.74e3362283b6ef0c48686fb0e161da4043bbcc97.jpeg");
+        $mech->content_contains("/photo/c/" . $comment->id . ".0.jpeg");
     };
 
 };

diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
@@ -1559,7 +1559,9 @@ for my $test (
 
         my $update = $report->comments->first;
         ok $update, 'found update';
-        $mech->content_contains('Photo of this report" src="/photo/temp') if $test->{fields}->{photo1};
+
+        $mech->content_contains("/photo/c/" . $update->id . ".0.jpeg") if $test->{fields}->{photo1};
+
         if ( !defined( $test->{endstate_banner} ) ) {
             is $mech->extract_problem_banner->{text}, undef, 'endstate banner';
         } else {

diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
@@ -434,8 +434,9 @@ subtest 'Photo publishing' => sub {
     $mech->content_contains('photo/' . $report->id . '.1.fp.jpeg');
     $mech->content_lacks('photo/' . $report->id . '.2.fp.jpeg');
     $mech->get_ok( '/report/' . $report->id );
-    my @photo_links = $mech->content =~ m#(Photo of this report" src="/photo/.*?")#g;
-    is @photo_links == 1, 1, "Only one photo shown";
+    $mech->content_lacks('photo/' . $report->id . '.0.jpeg');
+    $mech->content_contains('photo/' . $report->id . '.1.jpeg');
+    $mech->content_lacks('photo/' . $report->id . '.2.jpeg');
 
     # Internal notes
     $mech->get_ok( '/admin/report_edit/' . $report->id );

diff --git a/templates/web/base/report/photo.html b/templates/web/base/report/photo.html
@@ -5,8 +5,13 @@
   [% FOR photo IN object.photos %]
     [% IF c.cobrand.allow_photo_display(object, photo.idx) %]
       <div class="update-img">
+          [% IF alert_to_reporter %]
           <a href="[% photo.url_temp_full %]" rel="fancy">
               <img alt="Photo of this report" src="[% photo.url_temp %]">
+          [% ELSE %]
+          <a href="[% photo.url_full%]" rel="fancy">
+            <img alt="Photo of this report" src="[% photo.url %]">
+          [% END %]
           <span>zoom</span></a>
         [% IF can_moderate %]
           <p class="moderate-edit">