diff options
| -rw-r--r-- | db/schema.sql | 2 | ||||
| -rw-r--r-- | db/schema_0006-alter_problem_state.sql | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/DB/Result/Problem.pm | 2 | ||||
| -rw-r--r-- | t/app/controller/report_display.t | 2 | ||||
| -rw-r--r-- | t/app/model/problem.t | 6 | ||||
| -rw-r--r-- | t/app/model/questionnaire.t | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/db/schema.sql b/db/schema.sql index 823a60485..bb720077b 100644 --- a/db/schema.sql +++ b/db/schema.sql @@ -168,7 +168,7 @@ create table problem ( or state = 'investigating' or state = 'planned' or state = 'in progress' - or state = 'will not fix' + or state = 'closed' or state = 'fixed' or state = 'fixed - council' or state = 'fixed - user' diff --git a/db/schema_0006-alter_problem_state.sql b/db/schema_0006-alter_problem_state.sql index 1fdd30cb2..6fada1eb8 100644 --- a/db/schema_0006-alter_problem_state.sql +++ b/db/schema_0006-alter_problem_state.sql @@ -8,7 +8,7 @@ begin; or state = 'investigating' or state = 'planned' or state = 'in progress' - or state = 'will not fix' + or state = 'closed' or state = 'fixed' or state = 'fixed - council' or state = 'fixed - user' diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index 2d3a8bccb..65a2268b6 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -180,7 +180,7 @@ sub visible_states { 'fixed' => 1, 'fixed - council' => 1, 'fixed - user' => 1, - 'will not fix' => 1, + 'closed' => 1, }; return wantarray ? keys %{$states} : $states; diff --git a/t/app/controller/report_display.t b/t/app/controller/report_display.t index d20774560..5c66200c8 100644 --- a/t/app/controller/report_display.t +++ b/t/app/controller/report_display.t @@ -254,7 +254,7 @@ for my $test ( { description => 'closed report', date => DateTime->now, - state => 'will not fix', + state => 'closed', banner_id => '', banner_text => '', fixed => 0 diff --git a/t/app/model/problem.t b/t/app/model/problem.t index 38ddc1857..43f15dbde 100644 --- a/t/app/model/problem.t +++ b/t/app/model/problem.t @@ -186,7 +186,7 @@ for my $test ( is_open => 0, }, { - state => 'will not fix', + state => 'closed', is_open => 0, }, ) { @@ -230,7 +230,7 @@ for my $test ( is_fixed => 1, }, { - state => 'will not fix', + state => 'closed', is_fixed => 0, }, ) { @@ -282,7 +282,7 @@ for my $test ( is_visible => 1, }, { - state => 'will not fix', + state => 'closed', is_visible => 1, }, ) { diff --git a/t/app/model/questionnaire.t b/t/app/model/questionnaire.t index 2bc8f9b2c..60b52043a 100644 --- a/t/app/model/questionnaire.t +++ b/t/app/model/questionnaire.t @@ -78,7 +78,7 @@ for my $test ( send_email => 1, }, { - state => 'will not fix', + state => 'closed', send_email => 1, }, ) { |