1 files changed, 9 insertions, 6 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
index 19d057958..ad3827de9 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');
     }
 
@@ -128,8 +128,8 @@ sub submit_creator_fixed : Private {
     my $questionnaire = $c->model( 'DB::Questionnaire' )->find_or_new(
         {
             problem_id => $c->stash->{problem},
-            old_state  => 'confirmed',
-            new_state  => 'fixed',
+            old_state  => [ FixMyStreet::DB::Result::Problem->open_states() ],
+            new_state  => 'fixed - user',
         }
     );
 
@@ -156,8 +156,10 @@ 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' && 
+        FixMyStreet::DB::Result::Problem->open_states()->{$old_state};
+    $new_state = 'confirmed' if $c->stash->{been_fixed} eq 'No' &&
+        FixMyStreet::DB::Result::Problem->fixed_states()->{$old_state};
 
     # Record state change, if there was one
     if ( $new_state ) {
@@ -166,7 +168,8 @@ sub submit_standard : Private {
     }
 
     # If it's not fixed and they say it's still not been fixed, record time update
-    if ( $c->stash->{been_fixed} eq 'No' && $old_state eq 'confirmed' ) {
+    if ( $c->stash->{been_fixed} eq 'No' &&
+        FixMyStreet::DB::Result::Problem->open_states($old_state) ) {
         $problem->lastupdate( \'ms_current_timestamp()' );
     }