Merge branch '1939-questionnaire-links'

1 files changed, 14 insertions, 3 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index b9d773f5e..ec0e6f886 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -167,17 +167,28 @@ sub load_updates : Private {
         {
             problem_id => $c->stash->{problem}->id,
             whenanswered => { '!=', undef },
-            old_state => 'confirmed', new_state => 'confirmed',
+            old_state => [ -and =>
+                { -in => [ FixMyStreet::DB::Result::Problem::closed_states, FixMyStreet::DB::Result::Problem::open_states ] },
+                \'= new_state',
+            ]
         },
         { order_by => 'whenanswered' }
     );
 
     my @combined;
+    my %questionnaires_with_updates;
     while (my $update = $updates->next) {
         push @combined, [ $update->confirmed, $update ];
+        if (my $qid = $update->get_extra_metadata('questionnaire_id')) {
+            $questionnaires_with_updates{$qid} = $update;
+        }
     }
-    while (my $update = $questionnaires->next) {
-        push @combined, [ $update->whenanswered, $update ];
+    while (my $q = $questionnaires->next) {
+        if (my $update = $questionnaires_with_updates{$q->id}) {
+            $update->set_extra_metadata('open_from_questionnaire', 1);
+            next;
+        }
+        push @combined, [ $q->whenanswered, $q ];
     }
     @combined = map { $_->[1] } sort { $a->[0] <=> $b->[0] } @combined;
     $c->stash->{updates} = \@combined;