1 files changed, 39 insertions, 5 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 7c985fdfc..de69880c1 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -485,7 +485,7 @@ sub reports : Path('reports') {
     my ( $self, $c ) = @_;
 
     if (my $search = $c->req->param('search')) {
-        $c->stash->{searched} = 1;
+        $c->stash->{searched} = $search;
 
         my $site_restriction = $c->cobrand->site_restriction;
 
@@ -730,11 +730,9 @@ sub users: Path('users') : Args(0) {
     my ( $self, $c ) = @_;
 
     if (my $search = $c->req->param('search')) {
-        $c->stash->{searched} = 1;
+        $c->stash->{searched} = $search;
 
-        my $search = $c->req->param('search');
         my $isearch = '%' . $search . '%';
-
         my $search_n = 0;
         $search_n = int($search) if $search =~ /^\d+$/;
 
@@ -765,6 +763,9 @@ sub users: Path('users') : Args(0) {
             }
         }
 
+    } else {
+        $c->forward('get_token');
+        $c->forward('fetch_all_bodies');
     }
 
     return 1;
@@ -875,6 +876,35 @@ sub update_edit : Path('update_edit') : Args(1) {
     return 1;
 }
 
+sub user_add : Path('user_edit') : Args(0) {
+    my ( $self, $c ) = @_;
+
+    $c->stash->{template} = 'admin/user_edit.html';
+    $c->forward('get_token');
+    $c->forward('fetch_all_bodies');
+
+    return 1 unless $c->req->param('submit');
+
+    $c->forward('check_token');
+
+    my $user = $c->model('DB::User')->find_or_create( {
+        name => $c->req->param('name'),
+        email => $c->req->param('email'),
+        from_body => $c->req->param('body') || undef,
+        flagged => $c->req->param('flagged') || 0,
+    }, {
+        key => 'users_email_key'
+    } );
+    $c->stash->{user} = $user;
+
+    $c->forward( 'log_edit', [ $user->id, 'user', 'edit' ] );
+
+    $c->stash->{status_message} =
+      '<p><em>' . _('Updated!') . '</em></p>';
+
+    return 1;
+}
+
 sub user_edit : Path('user_edit') : Args(1) {
     my ( $self, $c, $id ) = @_;
 
@@ -1295,7 +1325,11 @@ sub fetch_all_bodies : Private {
     my ($self, $c ) = @_;
 
     my @bodies = $c->model('DB::Body')->all;
-    @bodies = sort { strcoll($a->name, $b->name) } @bodies;
+    if ( $c->cobrand->moniker eq 'zurich' ) {
+        @bodies = $c->cobrand->admin_fetch_all_bodies( @bodies );
+    } else {
+        @bodies = sort { strcoll($a->name, $b->name) } @bodies;
+    }
     $c->stash->{bodies} = \@bodies;
 
     return 1;