diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/My.pm | 3 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Reports.pm | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 19768b2db..590e4d3aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Keep commas in geocode lookups. - Show message on reports closed to updates. - Only display last 6 months of reports on around page by default #2098 + - Always show all reports by default on /my. - Admin improvements: - Mandatory defect type selection if defect raised. - Send login email button on user edit page #2041 diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm index f6ba9a6ee..9a2a4f470 100644 --- a/perllib/FixMyStreet/App/Controller/My.pm +++ b/perllib/FixMyStreet/App/Controller/My.pm @@ -97,6 +97,8 @@ sub planned_reorder : Private { sub get_problems : Private { my ($self, $c) = @_; + $c->stash->{page} = 'my'; + my $p_page = $c->get_param('p') || 1; $c->forward( '/reports/stash_report_filter_status' ); @@ -165,7 +167,6 @@ sub setup_page_data : Private { } )->all; $c->stash->{filter_categories} = \@categories; - $c->stash->{page} = 'my'; my $pins = $c->stash->{pins}; FixMyStreet::Map::display_map( $c, diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm index 05776a94f..3fd53d630 100644 --- a/perllib/FixMyStreet/App/Controller/Reports.pm +++ b/perllib/FixMyStreet/App/Controller/Reports.pm @@ -33,6 +33,7 @@ sub index : Path : Args(0) { # Zurich goes straight to map page, with all reports if ( $c->cobrand->moniker eq 'zurich' ) { + $c->stash->{page} = 'reports'; $c->forward( 'stash_report_filter_status' ); $c->forward( 'load_and_group_problems' ); $c->stash->{body} = { id => 0 }; # So template can fetch the list @@ -42,7 +43,6 @@ sub index : Path : Args(0) { } my $pins = $c->stash->{pins}; - $c->stash->{page} = 'reports'; FixMyStreet::Map::display_map( $c, latitude => @$pins ? $pins->[0]{latitude} : 0, @@ -150,6 +150,8 @@ sub ward : Path : Args(2) { $c->go('index'); } + $c->stash->{page} = 'reports'; # So the map knows to make clickable pins + $c->forward( 'ward_check', [ @wards ] ) if @wards; $c->forward( 'check_canonical_url', [ $body ] ); @@ -176,7 +178,6 @@ sub ward : Path : Args(2) { my $pins = $c->stash->{pins}; - $c->stash->{page} = 'reports'; # So the map knows to make clickable pins my %map_params = ( latitude => @$pins ? $pins->[0]{latitude} : 0, longitude => @$pins ? $pins->[0]{longitude} : 0, @@ -678,7 +679,7 @@ sub stash_report_filter_status : Private { my ( $self, $c ) = @_; my @status = $c->get_param_list('status', 1); - @status = ($c->cobrand->on_map_default_status) unless @status; + @status = ($c->stash->{page} eq 'my' ? 'all' : $c->cobrand->on_map_default_status) unless @status; my %status = map { $_ => 1 } @status; my %filter_problem_states; |