diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-08-22 11:22:33 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-08-22 11:22:33 +0100 |
| commit | 44c31ab8efbd97086e17d26c819b1d5b4946ce43 (patch) | |
| tree | 5a509a5006afd50f4c48f52fdf45ac9ac86ac054 /perllib/FixMyStreet/App/Controller/JSON.pm | |
| parent | f93ff062c986847f97aef76673c2ca7742f1f125 (diff) | |
| parent | a9a4fed583d7467c9c1f1fa56d42bcb75b4b488c (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into open311-consumer
Conflicts:
t/app/model/problem.t
templates/web/default/report/new/fill_in_details.html
web/css/core.css
Diffstat (limited to 'perllib/FixMyStreet/App/Controller/JSON.pm')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/JSON.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perllib/FixMyStreet/App/Controller/JSON.pm b/perllib/FixMyStreet/App/Controller/JSON.pm index a89fb3e6c..f3607341a 100644 --- a/perllib/FixMyStreet/App/Controller/JSON.pm +++ b/perllib/FixMyStreet/App/Controller/JSON.pm @@ -71,12 +71,12 @@ sub problems : Local { } # query the database - my ( $state, $date_col ); + my ( @state, $date_col ); if ( $type eq 'new_problems' ) { - $state = 'confirmed'; + @state = FixMyStreet::DB::Result::Problem->open_states(); $date_col = 'confirmed'; } elsif ( $type eq 'fixed_problems' ) { - $state = 'fixed'; + @state = FixMyStreet::DB::Result::Problem->fixed_states(); $date_col = 'lastupdate'; } @@ -86,7 +86,7 @@ sub problems : Local { '>=' => $start_dt, '<=' => $end_dt + $one_day, }, - state => $state, + state => [ @state ], }; $query->{category} = $category if $category; my @problems = $c->cobrand->problems->search( $query, { |