1 files changed, 44 insertions, 20 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin/Users.pm b/perllib/FixMyStreet/App/Controller/Admin/Users.pm
index 26f81992a..29c8f805c 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Users.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Users.pm
@@ -28,35 +28,51 @@ sub index :Path : Args(0) {
     my ( $self, $c ) = @_;
 
 
-    if (my $search = $c->get_param('search')) {
-        $search = $self->trim($search);
-        $search =~ s/^<(.*)>$/$1/; # In case email wrapped in <...>
-        $c->stash->{searched} = $search;
-
-        my $isearch = '%' . $search . '%';
-        my $search_n = 0;
-        $search_n = int($search) if $search =~ /^\d+$/;
+    my $search = $c->get_param('search');
+    my $role = $c->get_param('role');
+    if ($search || $role) {
+        my $users = $c->cobrand->users;
+        my $isearch;
+        if ($search) {
+            $search = $self->trim($search);
+            $search =~ s/^<(.*)>$/$1/; # In case email wrapped in <...>
+            $c->stash->{searched} = $search;
+
+            $isearch = '%' . $search . '%';
+            my $search_n = 0;
+            $search_n = int($search) if $search =~ /^\d+$/;
+
+            $users = $users->search(
+                {
+                    -or => [
+                        email => { ilike => $isearch },
+                        phone => { ilike => $isearch },
+                        name => { ilike => $isearch },
+                        from_body => $search_n,
+                    ]
+                }
+            );
+        }
+        if ($role) {
+            $c->stash->{role_selected} = $role;
+            $users = $users->search({
+                role_id => $role,
+            }, {
+                join => 'user_roles',
+            });
+        }
 
-        my $users = $c->cobrand->users->search(
-            {
-                -or => [
-                    email => { ilike => $isearch },
-                    phone => { ilike => $isearch },
-                    name => { ilike => $isearch },
-                    from_body => $search_n,
-                ]
-            }
-        );
         my @users = $users->all;
         $c->stash->{users} = [ @users ];
-        $c->forward('/admin/add_flags', [ { email => { ilike => $isearch } } ]);
+        if ($search) {
+            $c->forward('/admin/add_flags', [ { email => { ilike => $isearch } } ]);
+        }
 
     } else {
         $c->forward('/auth/get_csrf_token');
         $c->forward('/admin/fetch_all_bodies');
         $c->cobrand->call_hook('admin_user_edit_extra_data');
 
-
         # Admin users by default
         my $users = $c->cobrand->users->search(
             { from_body => { '!=', undef } },
@@ -66,6 +82,14 @@ sub index :Path : Args(0) {
         $c->stash->{users} = \@users;
     }
 
+    my $rs;
+    if ($c->user->is_superuser) {
+        $rs = $c->model('DB::Role')->search_rs({}, { join => 'body', order_by => ['body.name', 'me.name'] });
+    } elsif ($c->user->from_body) {
+        $rs = $c->user->from_body->roles->search_rs({}, { order_by => 'name' });
+    }
+    $c->stash->{roles} = [ $rs->all ];
+
     return 1;
 }