From 741abb421c66bdf91a60a988d7250feb59c6ca45 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Mon, 1 Oct 2012 12:31:51 +0100
Subject: Don't have the list of states harcoded in more than one place Also
 sort out some warnings that were being issues during tests

---
 perllib/FixMyStreet/App/Controller/Admin.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'perllib/FixMyStreet/App/Controller/Admin.pm')

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 298c75352..1efa2827b 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -59,11 +59,9 @@ sub index : Path : Args(0) {
 
     %prob_counts =
       map { $_ => $prob_counts{$_} || 0 }
-      ('confirmed', 'investigating', 'in progress', 'closed', 'fixed - council',
-          'fixed - user', 'fixed', 'unconfirmed', 'hidden',
-          'partial', 'planned');
+        ( FixMyStreet::DB::Result::Problem->all_states() );
     $c->stash->{problems} = \%prob_counts;
-    $c->stash->{total_problems_live} += $prob_counts{$_} 
+    $c->stash->{total_problems_live} += $prob_counts{$_} ? $prob_counts{$_} : 0
         for ( FixMyStreet::DB::Result::Problem->visible_states() );
     $c->stash->{total_problems_users} = $c->cobrand->problems->unique_users;
 
-- 
cgit v1.2.3


From 9c9fb7456d614c7d96881751a14f2dfff5c4225d Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Wed, 3 Oct 2012 15:23:31 +0100
Subject: add send_extended_statuses conf option and use in send-comments

---
 perllib/FixMyStreet/App/Controller/Admin.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'perllib/FixMyStreet/App/Controller/Admin.pm')

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 1efa2827b..54d744ccd 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -338,7 +338,7 @@ sub update_contacts : Private {
     } elsif ( $posted eq 'open311' ) {
         $c->forward('check_token');
 
-        my %params = map { $_ => $c->req->param($_) || '' } qw/open311_id endpoint jurisdiction api_key area_id send_method send_comments suppress_alerts comment_user_id/;
+        my %params = map { $_ => $c->req->param($_) || '' } qw/open311_id endpoint jurisdiction api_key area_id send_method send_comments suppress_alerts extended_statuses comment_user_id/;
 
         if ( $params{open311_id} ) {
             my $conf = $c->model('DB::Open311Conf')->find( { id => $params{open311_id} } );
@@ -350,6 +350,7 @@ sub update_contacts : Private {
             $conf->send_comments( $params{send_comments} || 0);
             $conf->suppress_alerts( $params{suppress_alerts} || 0);
             $conf->comment_user_id( $params{comment_user_id} || undef );
+            $conf->send_extended_statuses( $params{extended_statuses} || 0 );
 
             $conf->update();
 
@@ -364,6 +365,7 @@ sub update_contacts : Private {
             $conf->send_comments( $params{send_comments} || 0);
             $conf->suppress_alerts( $params{suppress_alerts} || 0);
             $conf->comment_user_id( $params{comment_user_id} || undef );
+            $conf->send_extended_statuses( $params{extended_statuses} || 0 );
 
             $conf->insert();
 
-- 
cgit v1.2.3