From 01750786cc7f8d13f939eb75284f1d805673effe Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 18 Aug 2011 13:57:16 +0100
Subject: remove hard coded references to fixed

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

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

diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm
index 1021f7056..677f23ceb 100644
--- a/perllib/FixMyStreet/App/Controller/My.pm
+++ b/perllib/FixMyStreet/App/Controller/My.pm
@@ -31,7 +31,7 @@ sub my : Path : Args(0) {
     my $pins = [];
     my $problems = {};
     my $rs = $c->user->problems->search( {
-        state => [ 'confirmed', 'fixed' ],
+        state => [ FixMyStreet::DB::Result::Problem->visible_states() ],
     }, {
         order_by => { -desc => 'confirmed' },
         rows => 50
@@ -41,7 +41,7 @@ sub my : Path : Args(0) {
         push @$pins, {
             latitude  => $problem->latitude,
             longitude => $problem->longitude,
-            colour    => $problem->state eq 'fixed' ? 'green' : 'red',
+            colour    => $problem->is_fixed ? 'green' : 'red',
             id        => $problem->id,
             title     => $problem->title,
         };
-- 
cgit v1.2.3


From 8c1ffdca6e94c0affc67def47d10db339cf28e5c Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 18 Aug 2011 18:14:06 +0100
Subject: do not use raw problem state to categorise problems

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

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

diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm
index 677f23ceb..87b78eef4 100644
--- a/perllib/FixMyStreet/App/Controller/My.pm
+++ b/perllib/FixMyStreet/App/Controller/My.pm
@@ -45,7 +45,8 @@ sub my : Path : Args(0) {
             id        => $problem->id,
             title     => $problem->title,
         };
-        push @{ $problems->{$problem->state} }, $problem;
+        my $state = $problem->is_fixed ? 'fixed' : 'confirmed';
+        push @{ $problems->{$state} }, $problem;
     }
     $c->stash->{problems_pager} = $rs->pager;
     $c->stash->{problems} = $problems;
-- 
cgit v1.2.3


From 66657b4d1a4aa002609c2435a9a7686cd3257cdc Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 18 Aug 2011 18:22:33 +0100
Subject: show closed problems on my page

---
 perllib/FixMyStreet/App/Controller/My.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm
index 87b78eef4..60e9dd09f 100644
--- a/perllib/FixMyStreet/App/Controller/My.pm
+++ b/perllib/FixMyStreet/App/Controller/My.pm
@@ -45,7 +45,7 @@ sub my : Path : Args(0) {
             id        => $problem->id,
             title     => $problem->title,
         };
-        my $state = $problem->is_fixed ? 'fixed' : 'confirmed';
+        my $state = $problem->is_fixed ? 'fixed' : $problem->is_closed ? 'closed' : 'confirmed';
         push @{ $problems->{$state} }, $problem;
     }
     $c->stash->{problems_pager} = $rs->pager;
-- 
cgit v1.2.3