3 files changed, 109 insertions, 7 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin/States.pm b/perllib/FixMyStreet/App/Controller/Admin/States.pm
new file mode 100644
index 000000000..e4c07c9ca
--- /dev/null
+++ b/perllib/FixMyStreet/App/Controller/Admin/States.pm
@@ -0,0 +1,102 @@
+package FixMyStreet::App::Controller::Admin::States;
+use Moose;
+use namespace::autoclean;
+
+BEGIN { extends 'Catalyst::Controller'; }
+
+sub begin : Private {
+    my ( $self, $c ) = @_;
+
+    $c->forward('/admin/begin');
+}
+
+sub index : Path : Args(0) {
+    my ( $self, $c ) = @_;
+
+    $c->forward('/auth/get_csrf_token');
+    $c->forward('/admin/fetch_languages');
+    my $rs = $c->model('DB::State');
+
+    if ($c->req->method eq 'POST') {
+        $c->forward('/auth/check_csrf_token');
+
+        $c->forward('process_new')
+        && $c->forward('delete')
+        && $c->forward('update');
+
+        $rs->clear;
+    }
+
+    $c->stash->{open_states} = $rs->open;
+    $c->stash->{closed_states} = $rs->closed;
+    $c->stash->{fixed_states} = $rs->fixed;
+}
+
+sub process_new : Private {
+    my ($self, $c) = @_;
+    if ($c->get_param('new_fixed')) {
+        $c->model('DB::State')->create({
+            label => 'fixed',
+            type => 'fixed',
+            name => _('Fixed'),
+        });
+        return 0;
+    }
+    return 1 unless $c->get_param('new');
+    my %params = map { $_ => $c->get_param($_) } qw/label type name/;
+    $c->model('DB::State')->create(\%params);
+    return 0;
+}
+
+sub delete : Private {
+    my ($self, $c) = @_;
+
+    my @params = keys %{ $c->req->params };
+    my ($to_delete) = map { /^delete:(.*)/ } grep { /^delete:/ } @params;
+    if ($to_delete) {
+        $c->model('DB::State')->search({ label => $to_delete })->delete;
+        return 0;
+    }
+    return 1;
+}
+
+sub update : Private {
+    my ($self, $c) = @_;
+
+    my $rs = $c->model('DB::State');
+    my %db_states = map { $_->label => $_ } @{$rs->states};
+    my @params = keys %{ $c->req->params };
+    my @states = map { /^type:(.*)/ } grep { /^type:/ } @params;
+
+    foreach my $state (@states) {
+        # If there is only one language, we still store confirmed/closed
+        # as translations, as that seems a sensible place to store them.
+        if ($state eq 'confirmed' or $state eq 'closed') {
+            if (my $name = $c->get_param("name:$state")) {
+                my ($lang) = keys %{$c->stash->{languages}};
+                $db_states{$state}->add_translation_for('name', $lang, $name);
+            }
+        } else {
+            $db_states{$state}->update({
+                type => $c->get_param("type:$state"),
+                name => $c->get_param("name:$state"),
+            });
+        }
+
+        foreach my $lang (keys(%{$c->stash->{languages}})) {
+            my $id = $c->get_param("translation_id:$state:$lang");
+            my $text = $c->get_param("translation:$state:$lang");
+            if ($text) {
+                $db_states{$state}->add_translation_for('name', $lang, $text);
+            } elsif ($id) {
+                $c->model('DB::Translation')->find({ id => $id })->delete;
+            }
+        }
+    }
+
+    return 1;
+}
+
+__PACKAGE__->meta->make_immutable;
+
+1;
diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index fbe5a2dc9..f3989e760 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -24,6 +24,8 @@ sub example : Local : Args(0) {
     my ( $self, $c ) = @_;
     $c->stash->{template} = 'dashboard/index.html';
 
+    $c->stash->{filter_states} = $c->cobrand->state_groups_inspect;
+
     $c->stash->{children} = {};
     for my $i (1..3) {
         $c->stash->{children}{$i} = { id => $i, name => "Ward $i" };
@@ -93,6 +95,7 @@ sub index : Path : Args(0) {
     $c->stash->{body} = $body;
 
     # Set up the data for the dropdowns
+    $c->stash->{filter_states} = $c->cobrand->state_groups_inspect;
 
     # Just take the first area ID we find
     my $area_id = $body->body_areas->first->area_id;
@@ -145,12 +148,10 @@ sub index : Path : Args(0) {
     # List of reports underneath summary table
 
     $c->stash->{q_state} = $c->get_param('state') || '';
-    if ( $c->stash->{q_state} eq 'fixed' ) {
+    if ( $c->stash->{q_state} eq 'fixed - council' ) {
         $prob_where->{'me.state'} = [ FixMyStreet::DB::Result::Problem->fixed_states() ];
     } elsif ( $c->stash->{q_state} ) {
         $prob_where->{'me.state'} = $c->stash->{q_state};
-        $prob_where->{'me.state'} = { IN => [ 'planned', 'action scheduled' ] }
-            if $prob_where->{'me.state'} eq 'action scheduled';
     }
     my $params = {
         %$prob_where,
diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index b597cb7a8..8f8205719 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -558,12 +558,11 @@ sub stash_report_filter_status : Private {
     if ($c->user and ($c->user->is_superuser or (
           $c->stash->{body} and $c->user->belongs_to_body($c->stash->{body}->id)
     ))) {
+        $c->stash->{filter_states} = $c->cobrand->state_groups_inspect;
         foreach my $state (FixMyStreet::DB::Result::Problem->visible_states()) {
             if ($status{$state}) {
-                %filter_problem_states = (%filter_problem_states, ($state => 1));
-                my $pretty_state = $state;
-                $pretty_state =~ tr/ /_/;
-                $filter_status{$pretty_state} = 1;
+                $filter_problem_states{$state} = 1;
+                $filter_status{$state} = 1;
             }
         }
     }