Factor out admin reports code to own controller.

16 files changed, 529 insertions, 507 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 04c41351e..975fed02f 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -4,20 +4,9 @@ use namespace::autoclean;
 
 BEGIN { extends 'Catalyst::Controller'; }
 
-use Path::Class;
-use POSIX qw(strftime strcoll);
-use Digest::SHA qw(sha1_hex);
-use mySociety::EmailUtil qw(is_valid_email is_valid_email_list);
-use DateTime::Format::Strptime;
+use POSIX qw(strcoll);
 use List::Util 'first';
-use List::MoreUtils 'uniq';
-use mySociety::ArrayUtils;
-use Text::CSV;
-use Try::Tiny;
-
-use FixMyStreet::SendReport;
 use FixMyStreet::SMS;
-use Utils;
 
 =head1 NAME
 
@@ -214,157 +203,6 @@ sub fetch_languages : Private {
     return 1;
 }
 
-sub reports : Path('reports') {
-    my ( $self, $c ) = @_;
-
-    $c->stash->{edit_body_contacts} = 1
-        if grep { $_ eq 'body' } keys %{$c->stash->{allowed_pages}};
-
-    my $query = {};
-    if ( $c->cobrand->moniker eq 'zurich' ) {
-        my $type = $c->stash->{admin_type};
-        my $body = $c->stash->{body};
-        if ( $type eq 'dm' ) {
-            my @children = map { $_->id } $body->bodies->all;
-            my @all = (@children, $body->id);
-            $query = { bodies_str => \@all };
-        } elsif ( $type eq 'sdm' ) {
-            $query = { bodies_str => $body->id };
-        }
-    }
-
-    my $order = $c->get_param('o') || 'id';
-    my $dir = defined $c->get_param('d') ? $c->get_param('d') : 1;
-    $c->stash->{order} = $order;
-    $c->stash->{dir} = $dir;
-    $order = $dir ? { -desc => "me.$order" } : "me.$order";
-
-    my $p_page = $c->get_param('p') || 1;
-    my $u_page = $c->get_param('u') || 1;
-
-    return if $c->cobrand->call_hook(report_search_query => $query, $p_page, $u_page, $order);
-
-    if (my $search = $c->get_param('search')) {
-        $search = $self->trim($search);
-
-        # In case an email address, wrapped in <...>
-        if ($search =~ /^<(.*)>$/) {
-            my $possible_email = $1;
-            my $parsed = FixMyStreet::SMS->parse_username($possible_email);
-            $search = $possible_email if $parsed->{email};
-        }
-
-        $c->stash->{searched} = $search;
-
-        my $search_n = 0;
-        $search_n = int($search) if $search =~ /^\d+$/;
-
-        my $like_search = "%$search%";
-
-        my $parsed = FixMyStreet::SMS->parse_username($search);
-        my $valid_phone = $parsed->{phone};
-        my $valid_email = $parsed->{email};
-
-        if ($valid_email) {
-            $query->{'-or'} = [
-                'user.email' => { ilike => $like_search },
-            ];
-        } elsif ($valid_phone) {
-            $query->{'-or'} = [
-                'user.phone' => { ilike => $like_search },
-            ];
-        } elsif ($search =~ /^id:(\d+)$/) {
-            $query->{'-or'} = [
-                'me.id' => int($1),
-            ];
-        } elsif ($search =~ /^area:(\d+)$/) {
-            $query->{'-or'} = [
-                'me.areas' => { like => "%,$1,%" }
-            ];
-        } elsif ($search =~ /^ref:(\d+)$/) {
-            $query->{'-or'} = [
-                'me.external_id' => { like => "%$1%" }
-            ];
-        } else {
-            $query->{'-or'} = [
-                'me.id' => $search_n,
-                'user.email' => { ilike => $like_search },
-                'user.phone' => { ilike => $like_search },
-                'me.external_id' => { ilike => $like_search },
-                'me.name' => { ilike => $like_search },
-                'me.title' => { ilike => $like_search },
-                detail => { ilike => $like_search },
-                bodies_str => { like => $like_search },
-                cobrand_data => { like => $like_search },
-            ];
-        }
-
-        my $problems = $c->cobrand->problems->search(
-            $query,
-            {
-                prefetch => 'user',
-                rows => 50,
-                order_by => $order,
-            }
-        )->page( $p_page );
-
-        $c->stash->{problems} = [ $problems->all ];
-        $c->stash->{problems_pager} = $problems->pager;
-
-        if ($valid_email) {
-            $query = [
-                'user.email' => { ilike => $like_search },
-            ];
-        } elsif ($valid_phone) {
-            $query = [
-                'user.phone' => { ilike => $like_search },
-            ];
-        } elsif ($search =~ /^id:(\d+)$/) {
-            $query = [
-                'me.id' => int($1),
-                'me.problem_id' => int($1),
-            ];
-        } elsif ($search =~ /^area:(\d+)$/) {
-            $query = [];
-        } else {
-            $query = [
-                'me.id' => $search_n,
-                'problem.id' => $search_n,
-                'user.email' => { ilike => $like_search },
-                'user.phone' => { ilike => $like_search },
-                'me.name' => { ilike => $like_search },
-                text => { ilike => $like_search },
-                'me.cobrand_data' => { ilike => $like_search },
-            ];
-        }
-
-        if (@$query) {
-            my $updates = $c->cobrand->updates->search(
-                {
-                    -or => $query,
-                },
-                {
-                    -select   => [ 'me.*', qw/problem.bodies_str problem.state/ ],
-                    prefetch => [qw/user problem/],
-                    rows => 50,
-                    order_by => { -desc => 'me.id' }
-                }
-            )->page( $u_page );
-            $c->stash->{updates} = [ $updates->all ];
-            $c->stash->{updates_pager} = $updates->pager;
-        }
-
-    } else {
-
-        my $problems = $c->cobrand->problems->search(
-            $query,
-            { order_by => $order, rows => 50 }
-        )->page( $p_page );
-        $c->stash->{problems} = [ $problems->all ];
-        $c->stash->{problems_pager} = $problems->pager;
-    }
-}
-
 sub update_user : Private {
     my ($self, $c, $object) = @_;
     my $parsed = FixMyStreet::SMS->parse_username($c->get_param('username'));
@@ -378,322 +216,6 @@ sub update_user : Private {
     return 0;
 }
 
-sub report_edit_display : Private {
-    my ( $self, $c ) = @_;
-
-    my $problem = $c->stash->{problem};
-
-    $c->stash->{page} = 'admin';
-    FixMyStreet::Map::display_map(
-        $c,
-        latitude  => $problem->latitude,
-        longitude => $problem->longitude,
-        pins      => $problem->used_map
-        ? [ {
-            latitude  => $problem->latitude,
-            longitude => $problem->longitude,
-            colour    => $c->cobrand->pin_colour($problem, 'admin'),
-            type      => 'big',
-            draggable => 1,
-          } ]
-        : [],
-        print_report => 1,
-    );
-}
-
-sub report_edit : Path('report_edit') : Args(1) {
-    my ( $self, $c, $id ) = @_;
-
-    my $problem = $c->cobrand->problems->search( { id => $id } )->first;
-
-    $c->detach( '/page_error_404_not_found', [] )
-      unless $problem;
-
-    unless (
-        $c->cobrand->moniker eq 'zurich'
-        || $c->user->has_permission_to(report_edit => $problem->bodies_str_ids)
-    ) {
-        $c->detach( '/page_error_403_access_denied', [] );
-    }
-
-    $c->stash->{problem} = $problem;
-    if ( $problem->extra ) {
-        my @fields;
-        if ( my $fields = $problem->get_extra_fields ) {
-            for my $field ( @{$fields} ) {
-                my $name = $field->{description} ?
-                    "$field->{description} ($field->{name})" :
-                    "$field->{name}";
-                push @fields, { name => $name, val => $field->{value} };
-            }
-        }
-        my $extra = $problem->get_extra_metadata;
-        if ( $extra->{duplicates} ) {
-            push @fields, { name => 'Duplicates', val => join( ',', @{ $problem->get_extra_metadata('duplicates') } ) };
-            delete $extra->{duplicates};
-        }
-        for my $key ( keys %$extra ) {
-            push @fields, { name => $key, val => $extra->{$key} };
-        }
-
-        $c->stash->{extra_fields} = \@fields;
-    }
-
-    $c->forward('/auth/get_csrf_token');
-
-    $c->forward('categories_for_point');
-
-    $c->forward('alerts_for_report');
-
-    $c->forward('check_username_for_abuse', [ $problem->user ] );
-
-    $c->stash->{updates} =
-      [ $c->model('DB::Comment')
-          ->search( { problem_id => $problem->id }, { order_by => [ 'created', 'id' ] } )
-          ->all ];
-
-    if (my $rotate_photo_param = $self->_get_rotate_photo_param($c)) {
-        $self->rotate_photo($c, $problem, @$rotate_photo_param);
-        $c->detach('report_edit_display');
-    }
-
-    if ( $c->cobrand->moniker eq 'zurich' ) {
-        my $done = $c->cobrand->admin_report_edit();
-        $c->detach('report_edit_display') if $done;
-    }
-
-    if ( $c->get_param('resend') && !$c->cobrand->call_hook('disable_resend') ) {
-        $c->forward('/auth/check_csrf_token');
-
-        $problem->resend;
-        $problem->update();
-        $c->stash->{status_message} = _('That problem will now be resent.');
-
-        $c->forward( 'log_edit', [ $id, 'problem', 'resend' ] );
-    }
-    elsif ( $c->get_param('mark_sent') ) {
-        $c->forward('/auth/check_csrf_token');
-        $problem->update({ whensent => \'current_timestamp' })->discard_changes;
-        $c->stash->{status_message} = _('That problem has been marked as sent.');
-        $c->forward( 'log_edit', [ $id, 'problem', 'marked sent' ] );
-    }
-    elsif ( $c->get_param('flaguser') ) {
-        $c->forward('users/flag');
-        $c->stash->{problem}->discard_changes;
-    }
-    elsif ( $c->get_param('removeuserflag') ) {
-        $c->forward('users/flag_remove');
-        $c->stash->{problem}->discard_changes;
-    }
-    elsif ( $c->get_param('banuser') ) {
-        $c->forward('users/ban');
-    }
-    elsif ( $c->get_param('submit') ) {
-        $c->forward('/auth/check_csrf_token');
-
-        my $old_state = $problem->state;
-
-        my %columns = (
-            flagged => $c->get_param('flagged') ? 1 : 0,
-            non_public => $c->get_param('non_public') ? 1 : 0,
-        );
-        foreach (qw/state anonymous title detail name external_id external_body external_team/) {
-            $columns{$_} = $c->get_param($_);
-        }
-        $problem->set_inflated_columns(\%columns);
-
-        if ($c->get_param('closed_updates')) {
-            $problem->set_extra_metadata(closed_updates => 1);
-        } else {
-            $problem->unset_extra_metadata('closed_updates');
-        }
-
-        $c->forward( '/admin/report_edit_category', [ $problem, $problem->state ne $old_state ] );
-        $c->forward('update_user', [ $problem ]);
-
-        # Deal with photos
-        my $remove_photo_param = $self->_get_remove_photo_param($c);
-        if ($remove_photo_param) {
-            $self->remove_photo($c, $problem, $remove_photo_param);
-        }
-
-        if ($problem->state eq 'hidden' || $problem->non_public) {
-            $problem->get_photoset->delete_cached(plus_updates => 1);
-        }
-
-        if ( $problem->is_visible() and $old_state eq 'unconfirmed' ) {
-            $problem->confirmed( \'current_timestamp' );
-        }
-
-        $problem->lastupdate( \'current_timestamp' );
-        $problem->update;
-
-        if ( $problem->state ne $old_state ) {
-            $c->forward( 'log_edit', [ $id, 'problem', 'state_change' ] );
-
-            my $name = $c->user->moderating_user_name;
-            my $extra = { is_superuser => 1 };
-            if ($c->user->from_body) {
-                delete $extra->{is_superuser};
-                $extra->{is_body_user} = $c->user->from_body->id;
-            }
-            my $timestamp = \'current_timestamp';
-            $problem->add_to_comments( {
-                text => $c->stash->{update_text} || '',
-                created => $timestamp,
-                confirmed => $timestamp,
-                user_id => $c->user->id,
-                name => $name,
-                mark_fixed => 0,
-                anonymous => 0,
-                state => 'confirmed',
-                problem_state => $problem->state,
-                extra => $extra
-            } );
-        }
-        $c->forward( 'log_edit', [ $id, 'problem', 'edit' ] );
-
-        $c->stash->{status_message} = _('Updated!');
-
-        # do this here otherwise lastupdate and confirmed times
-        # do not display correctly
-        $problem->discard_changes;
-    }
-
-    $c->detach('report_edit_display');
-}
-
-=head2 report_edit_category
-
-Handles changing a problem's category and the complexity that comes with it.
-Returns 1 if category changed, 0 if no change.
-
-=cut
-
-sub report_edit_category : Private {
-    my ($self, $c, $problem, $no_comment) = @_;
-
-    if ((my $category = $c->get_param('category')) ne $problem->category) {
-        my $disable_resend = $c->cobrand->call_hook('disable_resend');
-        my $category_old = $problem->category;
-        $problem->category($category);
-        my @contacts = grep { $_->category eq $problem->category } @{$c->stash->{contacts}};
-        my @new_body_ids = map { $_->body_id } @contacts;
-        # If the report has changed bodies (and not to a subset!) we need to resend it
-        my %old_map = map { $_ => 1 } @{$problem->bodies_str_ids};
-        if (!$disable_resend && grep !$old_map{$_}, @new_body_ids) {
-            $problem->resend;
-        }
-        # If the send methods of the old/new contacts differ we need to resend the report
-        my @new_send_methods = uniq map {
-            ( $_->body->can_be_devolved && $_->send_method ) ?
-            $_->send_method : $_->body->send_method
-                ? $_->body->send_method
-                : $c->cobrand->_fallback_body_sender()->{method};
-        } @contacts;
-        my %old_send_methods = map { $_ => 1 } split /,/, ($problem->send_method_used || "Email");
-        if (!$disable_resend && grep !$old_send_methods{$_}, @new_send_methods) {
-            $problem->resend;
-        }
-
-        $problem->bodies_str(join( ',', @new_body_ids ));
-        my $update_text = '*' . sprintf(_('Category changed from ‘%s’ to ‘%s’'), $category_old, $category) . '*';
-        if ($no_comment) {
-            $c->stash->{update_text} = $update_text;
-        } else {
-            $problem->add_to_comments({
-                text => $update_text,
-                created => \'current_timestamp',
-                confirmed => \'current_timestamp',
-                user_id => $c->user->id,
-                name => $c->user->from_body ? $c->user->from_body->name : $c->user->name,
-                state => 'confirmed',
-                mark_fixed => 0,
-                anonymous => 0,
-            });
-        }
-        return 1;
-    }
-    return 0;
-}
-
-=head2 report_edit_location
-
-Handles changing a problem's location and the complexity that comes with it.
-For now, we reject the new location if the new location and old locations aren't
-covered by the same body.
-
-Returns 2 if the new position (if any) is acceptable and changed,
-1 if acceptable and unchanged, undef otherwise.
-
-NB: This must be called before report_edit_category, as that might modify
-$problem->bodies_str.
-
-=cut
-
-sub report_edit_location : Private {
-    my ($self, $c, $problem) = @_;
-
-    return 1 unless $c->forward('/location/determine_location_from_coords');
-
-    my ($lat, $lon) = map { Utils::truncate_coordinate($_) } $problem->latitude, $problem->longitude;
-    if ( $c->stash->{latitude} != $lat || $c->stash->{longitude} != $lon ) {
-        # The two actions below change the stash, setting things up for e.g. a
-        # new report. But here we're only doing it in order to check the found
-        # bodies match; we don't want to overwrite the existing report data if
-        # this lookup is bad. So let's save the stash and restore it after the
-        # comparison.
-        my $safe_stash = { %{$c->stash} };
-        $c->stash->{fetch_all_areas} = 1;
-        $c->stash->{area_check_action} = 'admin';
-        $c->forward('/council/load_and_check_areas', []);
-        $c->forward('/report/new/setup_categories_and_bodies');
-        my %allowed_bodies = map { $_ => 1 } @{$problem->bodies_str_ids};
-        my @new_bodies = keys %{$c->stash->{bodies_to_list}};
-        my $bodies_match = grep { exists( $allowed_bodies{$_} ) } @new_bodies;
-        $c->stash($safe_stash);
-        return unless $bodies_match;
-        $problem->latitude($c->stash->{latitude});
-        $problem->longitude($c->stash->{longitude});
-        my $areas = $c->stash->{all_areas_mapit};
-        $problem->areas( ',' . join( ',', sort keys %$areas ) . ',' );
-        return 2;
-    }
-    return 1;
-}
-
-sub categories_for_point : Private {
-    my ($self, $c) = @_;
-
-    $c->stash->{report} = $c->stash->{problem};
-    # We have a report, stash its location
-    $c->forward('/report/new/determine_location_from_report');
-    # Look up the areas for this location
-    my $prefetched_all_areas = [ grep { $_ } split ',', $c->stash->{report}->areas ];
-    $c->forward('/around/check_location_is_acceptable', [ $prefetched_all_areas ]);
-    # As with a new report, fetch the bodies/categories
-    $c->forward('/report/new/setup_categories_and_bodies');
-
-    # Remove the "Pick a category" option
-    shift @{$c->stash->{category_options}} if @{$c->stash->{category_options}};
-
-    $c->stash->{categories_hash} = { map { $_->category => 1 } @{$c->stash->{category_options}} };
-
-    $c->forward('/admin/triage/setup_categories');
-
-}
-
-sub alerts_for_report : Private {
-    my ($self, $c) = @_;
-
-    $c->stash->{alert_count} = $c->model('DB::Alert')->search({
-        alert_type => 'new_updates',
-        parameter => $c->stash->{report}->id,
-        confirmed => 1,
-        whendisabled => undef,
-    })->count();
-}
-
 sub update_edit : Path('update_edit') : Args(1) {
     my ( $self, $c, $id ) = @_;
 
@@ -706,8 +228,8 @@ sub update_edit : Path('update_edit') : Args(1) {
 
     $c->stash->{update} = $update;
 
-    if (my $rotate_photo_param = $self->_get_rotate_photo_param($c)) {
-        $self->rotate_photo($c, $update, @$rotate_photo_param);
+    if (my $rotate_photo_param = $c->forward('_get_rotate_photo_param')) {
+        $c->forward('rotate_photo', [ $update, @$rotate_photo_param ]);
         return 1;
     }
 
@@ -741,9 +263,9 @@ sub update_edit : Path('update_edit') : Args(1) {
               $edited = 1;
         }
 
-        my $remove_photo_param = $self->_get_remove_photo_param($c);
+        my $remove_photo_param = $c->forward('_get_remove_photo_param');
         if ($remove_photo_param) {
-            $self->remove_photo($c, $update, $remove_photo_param);
+            $c->forward('remove_photo', [$update, $remove_photo_param]);
         }
 
         $c->stash->{status_message} = _('Updated!');
@@ -908,7 +430,7 @@ Rotate a photo 90 degrees left or right
 =cut
 
 # returns index of photo to rotate, if any
-sub _get_rotate_photo_param {
+sub _get_rotate_photo_param : Private {
     my ($self, $c) = @_;
     my $key = first { /^rotate_photo/ } keys %{ $c->req->params } or return;
     my ($index) = $key =~ /(\d+)$/;
@@ -938,7 +460,7 @@ Remove a photo from a report
 =cut
 
 # Returns index of photo(s) to remove, if any
-sub _get_remove_photo_param {
+sub _get_remove_photo_param : Private {
     my ($self, $c) = @_;
 
     return 'ALL' if $c->get_param('remove_photo');
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Reports.pm b/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
new file mode 100644
index 000000000..60a02f8fd
--- /dev/null
+++ b/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
@@ -0,0 +1,500 @@
+package FixMyStreet::App::Controller::Admin::Reports;
+use Moose;
+use namespace::autoclean;
+
+BEGIN { extends 'Catalyst::Controller'; }
+
+use List::MoreUtils 'uniq';
+use FixMyStreet::SMS;
+use Utils;
+
+=head1 NAME
+
+FixMyStreet::App::Controller::Admin::Reports - Catalyst Controller
+
+=head1 DESCRIPTION
+
+Admin pages
+
+=head1 METHODS
+
+=cut
+
+sub index : Path {
+    my ( $self, $c ) = @_;
+
+    $c->stash->{edit_body_contacts} = 1
+        if grep { $_ eq 'body' } keys %{$c->stash->{allowed_pages}};
+
+    my $query = {};
+    if ( $c->cobrand->moniker eq 'zurich' ) {
+        my $type = $c->stash->{admin_type};
+        my $body = $c->stash->{body};
+        if ( $type eq 'dm' ) {
+            my @children = map { $_->id } $body->bodies->all;
+            my @all = (@children, $body->id);
+            $query = { bodies_str => \@all };
+        } elsif ( $type eq 'sdm' ) {
+            $query = { bodies_str => $body->id };
+        }
+    }
+
+    my $order = $c->get_param('o') || 'id';
+    my $dir = defined $c->get_param('d') ? $c->get_param('d') : 1;
+    $c->stash->{order} = $order;
+    $c->stash->{dir} = $dir;
+    $order = $dir ? { -desc => "me.$order" } : "me.$order";
+
+    my $p_page = $c->get_param('p') || 1;
+    my $u_page = $c->get_param('u') || 1;
+
+    return if $c->cobrand->call_hook(report_search_query => $query, $p_page, $u_page, $order);
+
+    if (my $search = $c->get_param('search')) {
+        $search = $self->trim($search);
+
+        # In case an email address, wrapped in <...>
+        if ($search =~ /^<(.*)>$/) {
+            my $possible_email = $1;
+            my $parsed = FixMyStreet::SMS->parse_username($possible_email);
+            $search = $possible_email if $parsed->{email};
+        }
+
+        $c->stash->{searched} = $search;
+
+        my $search_n = 0;
+        $search_n = int($search) if $search =~ /^\d+$/;
+
+        my $like_search = "%$search%";
+
+        my $parsed = FixMyStreet::SMS->parse_username($search);
+        my $valid_phone = $parsed->{phone};
+        my $valid_email = $parsed->{email};
+
+        if ($valid_email) {
+            $query->{'-or'} = [
+                'user.email' => { ilike => $like_search },
+            ];
+        } elsif ($valid_phone) {
+            $query->{'-or'} = [
+                'user.phone' => { ilike => $like_search },
+            ];
+        } elsif ($search =~ /^id:(\d+)$/) {
+            $query->{'-or'} = [
+                'me.id' => int($1),
+            ];
+        } elsif ($search =~ /^area:(\d+)$/) {
+            $query->{'-or'} = [
+                'me.areas' => { like => "%,$1,%" }
+            ];
+        } elsif ($search =~ /^ref:(\d+)$/) {
+            $query->{'-or'} = [
+                'me.external_id' => { like => "%$1%" }
+            ];
+        } else {
+            $query->{'-or'} = [
+                'me.id' => $search_n,
+                'user.email' => { ilike => $like_search },
+                'user.phone' => { ilike => $like_search },
+                'me.external_id' => { ilike => $like_search },
+                'me.name' => { ilike => $like_search },
+                'me.title' => { ilike => $like_search },
+                detail => { ilike => $like_search },
+                bodies_str => { like => $like_search },
+                cobrand_data => { like => $like_search },
+            ];
+        }
+
+        my $problems = $c->cobrand->problems->search(
+            $query,
+            {
+                prefetch => 'user',
+                rows => 50,
+                order_by => $order,
+            }
+        )->page( $p_page );
+
+        $c->stash->{problems} = [ $problems->all ];
+        $c->stash->{problems_pager} = $problems->pager;
+
+        if ($valid_email) {
+            $query = [
+                'user.email' => { ilike => $like_search },
+            ];
+        } elsif ($valid_phone) {
+            $query = [
+                'user.phone' => { ilike => $like_search },
+            ];
+        } elsif ($search =~ /^id:(\d+)$/) {
+            $query = [
+                'me.id' => int($1),
+                'me.problem_id' => int($1),
+            ];
+        } elsif ($search =~ /^area:(\d+)$/) {
+            $query = [];
+        } else {
+            $query = [
+                'me.id' => $search_n,
+                'problem.id' => $search_n,
+                'user.email' => { ilike => $like_search },
+                'user.phone' => { ilike => $like_search },
+                'me.name' => { ilike => $like_search },
+                text => { ilike => $like_search },
+                'me.cobrand_data' => { ilike => $like_search },
+            ];
+        }
+
+        if (@$query) {
+            my $updates = $c->cobrand->updates->search(
+                {
+                    -or => $query,
+                },
+                {
+                    -select   => [ 'me.*', qw/problem.bodies_str problem.state/ ],
+                    prefetch => [qw/user problem/],
+                    rows => 50,
+                    order_by => { -desc => 'me.id' }
+                }
+            )->page( $u_page );
+            $c->stash->{updates} = [ $updates->all ];
+            $c->stash->{updates_pager} = $updates->pager;
+        }
+
+    } else {
+
+        my $problems = $c->cobrand->problems->search(
+            $query,
+            { order_by => $order, rows => 50 }
+        )->page( $p_page );
+        $c->stash->{problems} = [ $problems->all ];
+        $c->stash->{problems_pager} = $problems->pager;
+    }
+}
+
+sub edit_display : Private {
+    my ( $self, $c ) = @_;
+
+    my $problem = $c->stash->{problem};
+
+    $c->stash->{page} = 'admin';
+    FixMyStreet::Map::display_map(
+        $c,
+        latitude  => $problem->latitude,
+        longitude => $problem->longitude,
+        pins      => $problem->used_map
+        ? [ {
+            latitude  => $problem->latitude,
+            longitude => $problem->longitude,
+            colour    => $c->cobrand->pin_colour($problem, 'admin'),
+            type      => 'big',
+            draggable => 1,
+          } ]
+        : [],
+        print_report => 1,
+    );
+}
+
+sub edit : Path('/admin/report_edit') : Args(1) {
+    my ( $self, $c, $id ) = @_;
+
+    my $problem = $c->cobrand->problems->search( { id => $id } )->first;
+
+    $c->detach( '/page_error_404_not_found', [] )
+      unless $problem;
+
+    unless (
+        $c->cobrand->moniker eq 'zurich'
+        || $c->user->has_permission_to(report_edit => $problem->bodies_str_ids)
+    ) {
+        $c->detach( '/page_error_403_access_denied', [] );
+    }
+
+    $c->stash->{problem} = $problem;
+    if ( $problem->extra ) {
+        my @fields;
+        if ( my $fields = $problem->get_extra_fields ) {
+            for my $field ( @{$fields} ) {
+                my $name = $field->{description} ?
+                    "$field->{description} ($field->{name})" :
+                    "$field->{name}";
+                push @fields, { name => $name, val => $field->{value} };
+            }
+        }
+        my $extra = $problem->get_extra_metadata;
+        if ( $extra->{duplicates} ) {
+            push @fields, { name => 'Duplicates', val => join( ',', @{ $problem->get_extra_metadata('duplicates') } ) };
+            delete $extra->{duplicates};
+        }
+        for my $key ( keys %$extra ) {
+            push @fields, { name => $key, val => $extra->{$key} };
+        }
+
+        $c->stash->{extra_fields} = \@fields;
+    }
+
+    $c->forward('/auth/get_csrf_token');
+
+    $c->forward('categories_for_point');
+
+    $c->forward('alerts_for_report');
+
+    $c->forward('/admin/check_username_for_abuse', [ $problem->user ] );
+
+    $c->stash->{updates} =
+      [ $c->model('DB::Comment')
+          ->search( { problem_id => $problem->id }, { order_by => [ 'created', 'id' ] } )
+          ->all ];
+
+    if (my $rotate_photo_param = $c->forward('/admin/_get_rotate_photo_param')) {
+        $c->forward('/admin/rotate_photo', [$problem, @$rotate_photo_param]);
+        $c->detach('edit_display');
+    }
+
+    if ( $c->cobrand->moniker eq 'zurich' ) {
+        my $done = $c->cobrand->admin_report_edit();
+        $c->detach('edit_display') if $done;
+    }
+
+    if ( $c->get_param('resend') && !$c->cobrand->call_hook('disable_resend') ) {
+        $c->forward('/auth/check_csrf_token');
+
+        $problem->resend;
+        $problem->update();
+        $c->stash->{status_message} = _('That problem will now be resent.');
+
+        $c->forward( '/admin/log_edit', [ $id, 'problem', 'resend' ] );
+    }
+    elsif ( $c->get_param('mark_sent') ) {
+        $c->forward('/auth/check_csrf_token');
+        $problem->update({ whensent => \'current_timestamp' })->discard_changes;
+        $c->stash->{status_message} = _('That problem has been marked as sent.');
+        $c->forward( '/admin/log_edit', [ $id, 'problem', 'marked sent' ] );
+    }
+    elsif ( $c->get_param('flaguser') ) {
+        $c->forward('/admin/users/flag');
+        $c->stash->{problem}->discard_changes;
+    }
+    elsif ( $c->get_param('removeuserflag') ) {
+        $c->forward('/admin/users/flag_remove');
+        $c->stash->{problem}->discard_changes;
+    }
+    elsif ( $c->get_param('banuser') ) {
+        $c->forward('/admin/users/ban');
+    }
+    elsif ( $c->get_param('submit') ) {
+        $c->forward('/auth/check_csrf_token');
+
+        my $old_state = $problem->state;
+
+        my %columns = (
+            flagged => $c->get_param('flagged') ? 1 : 0,
+            non_public => $c->get_param('non_public') ? 1 : 0,
+        );
+        foreach (qw/state anonymous title detail name external_id external_body external_team/) {
+            $columns{$_} = $c->get_param($_);
+        }
+        $problem->set_inflated_columns(\%columns);
+
+        if ($c->get_param('closed_updates')) {
+            $problem->set_extra_metadata(closed_updates => 1);
+        } else {
+            $problem->unset_extra_metadata('closed_updates');
+        }
+
+        $c->forward( '/admin/reports/edit_category', [ $problem, $problem->state ne $old_state ] );
+        $c->forward('/admin/update_user', [ $problem ]);
+
+        # Deal with photos
+        my $remove_photo_param = $c->forward('/admin/_get_remove_photo_param');
+        if ($remove_photo_param) {
+            $c->forward('/admin/remove_photo', [ $problem, $remove_photo_param ]);
+        }
+
+        if ($problem->state eq 'hidden' || $problem->non_public) {
+            $problem->get_photoset->delete_cached(plus_updates => 1);
+        }
+
+        if ( $problem->is_visible() and $old_state eq 'unconfirmed' ) {
+            $problem->confirmed( \'current_timestamp' );
+        }
+
+        $problem->lastupdate( \'current_timestamp' );
+        $problem->update;
+
+        if ( $problem->state ne $old_state ) {
+            $c->forward( '/admin/log_edit', [ $id, 'problem', 'state_change' ] );
+
+            my $name = $c->user->moderating_user_name;
+            my $extra = { is_superuser => 1 };
+            if ($c->user->from_body) {
+                delete $extra->{is_superuser};
+                $extra->{is_body_user} = $c->user->from_body->id;
+            }
+            my $timestamp = \'current_timestamp';
+            $problem->add_to_comments( {
+                text => $c->stash->{update_text} || '',
+                created => $timestamp,
+                confirmed => $timestamp,
+                user_id => $c->user->id,
+                name => $name,
+                mark_fixed => 0,
+                anonymous => 0,
+                state => 'confirmed',
+                problem_state => $problem->state,
+                extra => $extra
+            } );
+        }
+        $c->forward( '/admin/log_edit', [ $id, 'problem', 'edit' ] );
+
+        $c->stash->{status_message} = _('Updated!');
+
+        # do this here otherwise lastupdate and confirmed times
+        # do not display correctly
+        $problem->discard_changes;
+    }
+
+    $c->detach('edit_display');
+}
+
+=head2 edit_category
+
+Handles changing a problem's category and the complexity that comes with it.
+Returns 1 if category changed, 0 if no change.
+
+=cut
+
+sub edit_category : Private {
+    my ($self, $c, $problem, $no_comment) = @_;
+
+    if ((my $category = $c->get_param('category')) ne $problem->category) {
+        my $disable_resend = $c->cobrand->call_hook('disable_resend');
+        my $category_old = $problem->category;
+        $problem->category($category);
+        my @contacts = grep { $_->category eq $problem->category } @{$c->stash->{contacts}};
+        my @new_body_ids = map { $_->body_id } @contacts;
+        # If the report has changed bodies (and not to a subset!) we need to resend it
+        my %old_map = map { $_ => 1 } @{$problem->bodies_str_ids};
+        if (!$disable_resend && grep !$old_map{$_}, @new_body_ids) {
+            $problem->resend;
+        }
+        # If the send methods of the old/new contacts differ we need to resend the report
+        my @new_send_methods = uniq map {
+            ( $_->body->can_be_devolved && $_->send_method ) ?
+            $_->send_method : $_->body->send_method
+                ? $_->body->send_method
+                : $c->cobrand->_fallback_body_sender()->{method};
+        } @contacts;
+        my %old_send_methods = map { $_ => 1 } split /,/, ($problem->send_method_used || "Email");
+        if (!$disable_resend && grep !$old_send_methods{$_}, @new_send_methods) {
+            $problem->resend;
+        }
+
+        $problem->bodies_str(join( ',', @new_body_ids ));
+        my $update_text = '*' . sprintf(_('Category changed from ‘%s’ to ‘%s’'), $category_old, $category) . '*';
+        if ($no_comment) {
+            $c->stash->{update_text} = $update_text;
+        } else {
+            $problem->add_to_comments({
+                text => $update_text,
+                created => \'current_timestamp',
+                confirmed => \'current_timestamp',
+                user_id => $c->user->id,
+                name => $c->user->from_body ? $c->user->from_body->name : $c->user->name,
+                state => 'confirmed',
+                mark_fixed => 0,
+                anonymous => 0,
+            });
+        }
+        return 1;
+    }
+    return 0;
+}
+
+=head2 edit_location
+
+Handles changing a problem's location and the complexity that comes with it.
+For now, we reject the new location if the new location and old locations aren't
+covered by the same body.
+
+Returns 2 if the new position (if any) is acceptable and changed,
+1 if acceptable and unchanged, undef otherwise.
+
+NB: This must be called before edit_category, as that might modify
+$problem->bodies_str.
+
+=cut
+
+sub edit_location : Private {
+    my ($self, $c, $problem) = @_;
+
+    return 1 unless $c->forward('/location/determine_location_from_coords');
+
+    my ($lat, $lon) = map { Utils::truncate_coordinate($_) } $problem->latitude, $problem->longitude;
+    if ( $c->stash->{latitude} != $lat || $c->stash->{longitude} != $lon ) {
+        # The two actions below change the stash, setting things up for e.g. a
+        # new report. But here we're only doing it in order to check the found
+        # bodies match; we don't want to overwrite the existing report data if
+        # this lookup is bad. So let's save the stash and restore it after the
+        # comparison.
+        my $safe_stash = { %{$c->stash} };
+        $c->stash->{fetch_all_areas} = 1;
+        $c->stash->{area_check_action} = 'admin';
+        $c->forward('/council/load_and_check_areas', []);
+        $c->forward('/report/new/setup_categories_and_bodies');
+        my %allowed_bodies = map { $_ => 1 } @{$problem->bodies_str_ids};
+        my @new_bodies = keys %{$c->stash->{bodies_to_list}};
+        my $bodies_match = grep { exists( $allowed_bodies{$_} ) } @new_bodies;
+        $c->stash($safe_stash);
+        return unless $bodies_match;
+        $problem->latitude($c->stash->{latitude});
+        $problem->longitude($c->stash->{longitude});
+        my $areas = $c->stash->{all_areas_mapit};
+        $problem->areas( ',' . join( ',', sort keys %$areas ) . ',' );
+        return 2;
+    }
+    return 1;
+}
+
+sub categories_for_point : Private {
+    my ($self, $c) = @_;
+
+    $c->stash->{report} = $c->stash->{problem};
+    # We have a report, stash its location
+    $c->forward('/report/new/determine_location_from_report');
+    # Look up the areas for this location
+    my $prefetched_all_areas = [ grep { $_ } split ',', $c->stash->{report}->areas ];
+    $c->forward('/around/check_location_is_acceptable', [ $prefetched_all_areas ]);
+    # As with a new report, fetch the bodies/categories
+    $c->forward('/report/new/setup_categories_and_bodies');
+
+    # Remove the "Pick a category" option
+    shift @{$c->stash->{category_options}} if @{$c->stash->{category_options}};
+
+    $c->stash->{categories_hash} = { map { $_->category => 1 } @{$c->stash->{category_options}} };
+
+    $c->forward('/admin/triage/setup_categories');
+
+}
+
+sub alerts_for_report : Private {
+    my ($self, $c) = @_;
+
+    $c->stash->{alert_count} = $c->model('DB::Alert')->search({
+        alert_type => 'new_updates',
+        parameter => $c->stash->{report}->id,
+        confirmed => 1,
+        whendisabled => undef,
+    })->count();
+}
+
+sub trim {
+    my $self = shift;
+    my $e = shift;
+    $e =~ s/^\s+//;
+    $e =~ s/\s+$//;
+    return $e;
+}
+
+__PACKAGE__->meta->make_immutable;
+
+1;
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Triage.pm b/perllib/FixMyStreet/App/Controller/Admin/Triage.pm
index 0eabd340d..428c35073 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Triage.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Triage.pm
@@ -113,7 +113,7 @@ sub update : Private {
     my $current_category = $problem->category;
     my $new_category = $c->get_param('category');
 
-    my $changed = $c->forward('/admin/report_edit_category', [ $problem, 1 ] );
+    my $changed = $c->forward('/admin/reports/edit_category', [ $problem, 1 ] );
 
     if ( $changed ) {
         $c->stash->{problem}->update( { state => 'confirmed' } );
diff --git a/perllib/FixMyStreet/App/Controller/Moderate.pm b/perllib/FixMyStreet/App/Controller/Moderate.pm
index f71698e84..8a9f3b5a2 100644
--- a/perllib/FixMyStreet/App/Controller/Moderate.pm
+++ b/perllib/FixMyStreet/App/Controller/Moderate.pm
@@ -298,7 +298,7 @@ sub moderate_location : Private {
 
     my $problem = $c->stash->{problem};
 
-    my $moved = $c->forward('/admin/report_edit_location', [ $problem ]);
+    my $moved = $c->forward('/admin/reports/edit_location', [ $problem ]);
     if (!$moved) {
         # New lat/lon isn't valid, show an error
         $c->stash->{moderate_errors} ||= [];
@@ -315,11 +315,11 @@ sub moderate_category : Private {
     return unless $c->get_param('category');
 
     # The admin category editing needs to know all the categories etc
-    $c->forward('/admin/categories_for_point');
+    $c->forward('/admin/reports/categories_for_point');
 
     my $problem = $c->stash->{problem};
 
-    my $changed = $c->forward( '/admin/report_edit_category', [ $problem, 1 ] );
+    my $changed = $c->forward( '/admin/reports/edit_category', [ $problem, 1 ] );
     # It might need to set_report_extras in future
     if ($changed) {
         return 'category';
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 89350b1cb..ff90132e4 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -372,7 +372,7 @@ sub inspect : Private {
     my $problem = $c->stash->{problem};
     my $permissions = $c->stash->{_permissions};
 
-    $c->forward('/admin/categories_for_point');
+    $c->forward('/admin/reports/categories_for_point');
     $c->stash->{report_meta} = { map { 'x' . $_->{name} => $_ } @{ $c->stash->{problem}->get_extra_fields() } };
 
     if ($c->cobrand->can('council_area_id')) {
@@ -477,7 +477,7 @@ sub inspect : Private {
             $problem->get_photoset->delete_cached(plus_updates => 1);
         }
 
-        if ( !$c->forward( '/admin/report_edit_location', [ $problem ] ) ) {
+        if ( !$c->forward( '/admin/reports/edit_location', [ $problem ] ) ) {
             # New lat/lon isn't valid, show an error
             $valid = 0;
             $c->stash->{errors} ||= [];
@@ -485,7 +485,7 @@ sub inspect : Private {
         }
 
         if ($permissions->{report_inspect} || $permissions->{report_edit_category}) {
-            $c->forward( '/admin/report_edit_category', [ $problem, 1 ] );
+            $c->forward( '/admin/reports/edit_category', [ $problem, 1 ] );
 
             if ($c->stash->{update_text}) {
                 $update_text .= "\n\n" . $c->stash->{update_text};
diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index 6bbbdc775..1040116ed 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -364,7 +364,7 @@ sub set_problem_state {
     my ($self, $c, $problem, $new_state) = @_;
     return $self->update_admin_log($c, $problem) if $new_state eq $problem->state;
     $problem->state( $new_state );
-    $c->forward( 'log_edit', [ $problem->id, 'problem', "state change to $new_state" ] );
+    $c->forward( '/admin/log_edit', [ $problem->id, 'problem', "state change to $new_state" ] );
 }
 
 =head1 C<update_admin_log>
@@ -388,7 +388,7 @@ sub update_admin_log {
         $text = "Logging time_spent";
     }
 
-    $c->forward( 'log_edit', [ $problem->id, 'problem', $text, $time_spent ] );
+    $c->forward( '/admin/log_edit', [ $problem->id, 'problem', $text, $time_spent ] );
 }
 
 # Any user with from_body set can view admin
@@ -898,7 +898,7 @@ sub admin_report_edit {
                 $self->set_problem_state($c, $problem, 'confirmed');
             }
             $problem->update;
-            $c->forward( 'log_edit', [ $problem->id, 'problem', 
+            $c->forward( '/admin/log_edit', [ $problem->id, 'problem',
                 $not_contactable ?
                     _('Customer not contactable')
                     : _('Sent report back') ] );
diff --git a/templates/web/base/admin/list_updates.html b/templates/web/base/admin/list_updates.html
index b23cd7ca3..e8abdddad 100644
--- a/templates/web/base/admin/list_updates.html
+++ b/templates/web/base/admin/list_updates.html
@@ -41,7 +41,7 @@
         </small></td>
         <td rowspan=2>
             [% IF c.user.has_permission_to('report_edit', update.problem.bodies_str_ids) %]
-                <a href="[% c.uri_for( 'update_edit', update.id ) %]">[% loc('Edit') %]</a>
+                <a href="[% c.uri_for_action( 'admin/update_edit', [ update.id ] ) %]">[% loc('Edit') %]</a>
             [% END %]
         </td>
     </tr>
diff --git a/templates/web/base/admin/problem_row.html b/templates/web/base/admin/problem_row.html
index 99142af4e..8d74fec13 100644
--- a/templates/web/base/admin/problem_row.html
+++ b/templates/web/base/admin/problem_row.html
@@ -23,7 +23,7 @@
             [% PROCESS value_or_nbsp value=problem.category_display %]
             <br>[%- IF edit_body_contacts -%]
               [% FOR body IN problem.bodies.values %]
-                <a href="[% c.uri_for('body', body.id ) %]">[% PROCESS value_or_nbsp value=body.name %]</a>
+                <a href="[% c.uri_for_action('admin/bodies/edit', [ body.id ] ) %]">[% PROCESS value_or_nbsp value=body.name %]</a>
               [% END %]
             [%- ELSE -%]
                 [%- PROCESS value_or_nbsp value=problem.bodies_str -%]
@@ -40,7 +40,7 @@
         </small></td>
         <td>
             [% IF c.user.has_permission_to('report_edit', problem.bodies_str_ids) %]
-                <a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a>
+                <a href="[% c.uri_for_action( '/admin/reports/edit', [ problem.id ] ) %]">[% loc('Edit') %]</a>
             [% END %]
         </td>
     </tr>
diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/reports/edit.html
index da800ff71..b4af705a9 100644
--- a/templates/web/base/admin/report_edit.html
+++ b/templates/web/base/admin/reports/edit.html
@@ -16,7 +16,7 @@
 
 <div id="side">
 
-<form method="post" action="[% c.uri_for( 'report_edit', problem.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+<form method="post" action="[% c.uri_for_action( '/admin/reports/edit', [ problem.id ] ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
     <input type="hidden" name="token" value="[% csrf_token %]" >
     <input type="hidden" name="submit" value="1" >
 
@@ -57,7 +57,7 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a>
   [% IF problem.bodies_str %]
     [% FOREACH body IN problem.bodies.values %]
       [% SET body_printed = 1 %]
-      <a href="[% c.uri_for('body', body.id) %]">[% body.name | html %]</a>
+      <a href="[% c.uri_for_action('admin/bodies/edit', [ body.id ]) %]">[% body.name | html %]</a>
       [%- ',' IF NOT loop.last %]
     [% END %]
     [% IF NOT body_printed %]
diff --git a/templates/web/base/admin/reports.html b/templates/web/base/admin/reports/index.html
index 7d8fe9561..adbd50224 100644
--- a/templates/web/base/admin/reports.html
+++ b/templates/web/base/admin/reports/index.html
@@ -1,7 +1,7 @@
 [% INCLUDE 'admin/header.html' title=loc('Search Reports') %]
 [% PROCESS 'admin/report_blocks.html' %]
 
-<form method="get" action="[% c.uri_for('reports') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+<form method="get" action="[% c.uri_for_action('/admin/reports/index') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
     <p><label for="search">[% loc('Search:') %]</label>
         <input class="form-control" type="text" name="search"  size="30" id="search" value="[% searched | html %]">
 </form>
diff --git a/templates/web/base/admin/users/index.html b/templates/web/base/admin/users/index.html
index f48893cb0..520cd1e3c 100644
--- a/templates/web/base/admin/users/index.html
+++ b/templates/web/base/admin/users/index.html
@@ -57,7 +57,7 @@
             [% PROCESS value_or_nbsp value=user.name %]
             [% IF user.from_body %]</label>[% END %]
         </td>
-        <td><a href="[% c.uri_for_action( 'admin/reports', search => user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td> 
+        <td><a href="[% c.uri_for_action( 'admin/reports/index', search => user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td>
         <td>[% PROCESS value_or_nbsp value=user.from_body.name %]
             [% IF user.is_superuser %] * [% END %]
         </td>
diff --git a/templates/web/base/report/inspect/information.html b/templates/web/base/report/inspect/information.html
index cc8989522..b81b37543 100644
--- a/templates/web/base/report/inspect/information.html
+++ b/templates/web/base/report/inspect/information.html
@@ -7,7 +7,7 @@
           <strong>[% loc('Report ID:') %]</strong>
           <span class="js-report-id">[% problem.id %]</span>
           [% IF c.user_exists AND c.cobrand.admin_allow_user(c.user) AND c.user.has_permission_to('report_edit', problem.bodies_str_ids) %]
-            (<a href="[% c.uri_for_action( "admin/report_edit", problem.id ) %]">[% loc('admin') %]</a>)
+            (<a href="[% c.uri_for_action( 'admin/reports/edit', [ problem.id ] ) %]">[% loc('admin') %]</a>)
           [% END %]
         </p>
         [% IF permissions.report_inspect AND problem.user.phone %]
diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html
index 973d9f651..502a7bc39 100644
--- a/templates/web/zurich/admin/problem_row.html
+++ b/templates/web/zurich/admin/problem_row.html
@@ -46,7 +46,7 @@
         </td>
 
         [% IF NOT no_edit %]
-            <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td>
+            <td><a href="[% c.uri_for_action( 'admin/reports/edit', [ problem.id ] ) %]">[% loc('Edit') %]</a></td>
         [% END %]
     </tr>
 [%- END -%]
diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html
index d8e6c2625..8d25ab40a 100644
--- a/templates/web/zurich/admin/report_edit-sdm.html
+++ b/templates/web/zurich/admin/report_edit-sdm.html
@@ -12,7 +12,7 @@
 
 <div id="map_sidebar">
 
-<form method="post" action="[% c.uri_for( 'report_edit', problem.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+<form method="post" action="[% c.uri_for_action( 'admin/reports/edit', [ problem.id ] ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
     <input type="hidden" name="token" value="[% csrf_token %]" >
     <input type="hidden" name="submit" value="1" >
 
diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/reports/edit.html
index 6f69161fe..4b0490b4a 100644
--- a/templates/web/zurich/admin/report_edit.html
+++ b/templates/web/zurich/admin/reports/edit.html
@@ -14,7 +14,7 @@
 
 [% pstate = problem.get_extra_metadata('closure_status') || problem.state %]
 
-<form id="report_edit" method="post" action="[% c.uri_for( 'report_edit', problem.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+<form id="report_edit" method="post" action="[% c.uri_for_action( 'admin/reports/edit', [ problem.id ] ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
     <input type="hidden" name="token" value="[% csrf_token %]" >
     <input type="hidden" name="submit" value="1" >
 
diff --git a/templates/web/zurich/admin/reports.html b/templates/web/zurich/admin/reports/index.html
index 7e425c8ec..481dfb49d 100644
--- a/templates/web/zurich/admin/reports.html
+++ b/templates/web/zurich/admin/reports/index.html
@@ -1,7 +1,7 @@
 [% PROCESS 'admin/header.html' title=loc('Search Reports') %]
 [% PROCESS 'admin/report_blocks.html' %]
 
-<form method="get" action="[% c.uri_for('reports') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+<form method="get" action="[% c.uri_for_action('admin/reports/index') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
     <p><label for="search">[% loc('Search:') %]</label> <input type="text" name="search"  size="30" id="search" value="[% searched | html %]">
 </form>