From ed29948a33b9f031abdbd63b258439e86f168541 Mon Sep 17 00:00:00 2001
From: aynsix <35221835+aynsix@users.noreply.github.com>
Date: Thu, 15 Mar 2018 20:04:29 +0400
Subject: [PATCH] add filter to hide special account in user list (#2522)

---
 lib/Alchemy/Phrasea/Helper/User/Manage.php | 2 ++
 lib/classes/User/Query.php                 | 2 +-
 templates/web/admin/users.html.twig        | 7 ++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Helper/User/Manage.php b/lib/Alchemy/Phrasea/Helper/User/Manage.php
index 588b55695b..980c484a90 100644
--- a/lib/Alchemy/Phrasea/Helper/User/Manage.php
+++ b/lib/Alchemy/Phrasea/Helper/User/Manage.php
@@ -91,6 +91,7 @@ class Manage extends Helper
             'sbas_id' => $this->request->get('sbas_id'),
             'base_id' => $this->request->get('base_id'),
             'last_model' => $this->request->get('last_model'),
+            'show_special_users' => $this->request->get('show_special_users') ? true : false,
             'srt' => $this->request->get("srt", \User_Query::SORT_CREATIONDATE),
             'ord' => $this->request->get("ord", \User_Query::ORD_DESC),
             'per_page' => $results_quantity,
@@ -109,6 +110,7 @@ class Manage extends Helper
             ->last_model_is($this->query_parms['last_model'])
             ->get_inactives($this->query_parms['inactives'])
             ->include_templates(true)
+            ->include_special_users($this->query_parms['show_special_users'])
             ->on_bases_where_i_am($this->app->getAclForUser($this->app->getAuthenticatedUser()), [\ACL::CANADMIN])
             ->limit($offset_start, $results_quantity)
             ->execute();
diff --git a/lib/classes/User/Query.php b/lib/classes/User/Query.php
index 2d1597571a..4cbcec3c9c 100644
--- a/lib/classes/User/Query.php
+++ b/lib/classes/User/Query.php
@@ -812,7 +812,7 @@ class User_Query
                 WHERE 1 ';
 
         if (! $this->include_special_users) {
-            $sql .= ' AND Users.login != "autoregister" AND Users.login != "invite" ';
+            $sql .= ' AND Users.login != "autoregister" AND Users.login NOT LIKE "guest%" ';
         }
 
         $sql .= ' AND Users.deleted="0" ';
diff --git a/templates/web/admin/users.html.twig b/templates/web/admin/users.html.twig
index ba53842983..3155947cea 100644
--- a/templates/web/admin/users.html.twig
+++ b/templates/web/admin/users.html.twig
@@ -33,7 +33,12 @@
 
         <form id="users_page_search" method="post" action="{{ path('admin_users_search') }}" target="_self" class="form-inline">
             <fieldset class="admin_head_opts">
-            <span>{{ 'Filter' | trans }}</span>
+                <span class="checkbox">
+                    {{ 'Show special users' | trans }}
+                    <input type="checkbox"  name="show_special_users" {% if parm['show_special_users'] %} checked="checked" {% endif %} style="margin-left:10px" />
+                </span>
+                <br/>
+                <span>{{ 'Filter' | trans }}</span>
                 <select name="like_field" class="input-medium">
                     <option {% if parm['like_field'] == "login" %}selected="selected"{% endif %} value="login">{{ 'Push::filter on login' | trans }}</option>
                     <option {% if parm['like_field'] == "name" %}selected="selected"{% endif %} value="name">{{ 'First/Last Name' | trans }}</option>