3 files changed, 8 insertions, 6 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm
index 17862aa0a..b4fa3a457 100644
--- a/perllib/FixMyStreet/App/Controller/Photo.pm
+++ b/perllib/FixMyStreet/App/Controller/Photo.pm
@@ -48,7 +48,7 @@ sub index :Path :Args(0) {
         $c->detach( 'no_photo' ) if $id =~ /\D/;
         @photo = $c->cobrand->problems->search( {
             id => $id,
-            state => [ 'confirmed', 'fixed', 'partial' ],
+            state => [ FixMyStreet::DB::Result::Problem->visible_states(), 'partial' ],
             photo => { '!=', undef },
         } );
     }
diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
index 19d057958..27c413259 100755
--- a/perllib/FixMyStreet/App/Controller/Questionnaire.pm
+++ b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
@@ -48,7 +48,7 @@ sub load_questionnaire : Private {
         $c->detach;
     }
 
-    unless ( $questionnaire->problem->state eq 'confirmed' || $questionnaire->problem->state eq 'fixed' ) {
+    unless ( $questionnaire->problem->is_visible ) {
         $c->detach('missing_problem');
     }
 
@@ -129,7 +129,7 @@ sub submit_creator_fixed : Private {
         {
             problem_id => $c->stash->{problem},
             old_state  => 'confirmed',
-            new_state  => 'fixed',
+            new_state  => 'fixed - user',
         }
     );
 
@@ -156,8 +156,9 @@ sub submit_standard : Private {
     my $problem = $c->stash->{problem};
     my $old_state = $problem->state;
     my $new_state = '';
-    $new_state = 'fixed' if $c->stash->{been_fixed} eq 'Yes' && $old_state eq 'confirmed';
-    $new_state = 'confirmed' if $c->stash->{been_fixed} eq 'No' && $old_state eq 'fixed';
+    $new_state = 'fixed - user' if $c->stash->{been_fixed} eq 'Yes' && $old_state eq 'confirmed';
+    $new_state = 'confirmed' if $c->stash->{been_fixed} eq 'No' &&
+        exists FixMyStreet::DB::Result::Problem->fixed_states()->{$old_state};
 
     # Record state change, if there was one
     if ( $new_state ) {
diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index 58b689bf9..2f895015b 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -354,7 +354,8 @@ sub add_row {
         ? 'unknown'
         : ($problem->{age} > $fourweeks ? 'older' : 'new');
     # Fixed problems are either old or new
-    push @{$fixed->{$council}{$duration_str}}, $problem if $problem->{state} eq 'fixed';
+    push @{$fixed->{$council}{$duration_str}}, $problem if
+        exists FixMyStreet::DB::Result::Problem->fixed_states()->{$problem->{state}};
     # Open problems are either unknown, older, or new
     push @{$open->{$council}{$type}}, $problem if $problem->{state} eq 'confirmed';
 }