hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

modify create guest account and filter guest user (#2534)

Browse Source
This commit is contained in:
aynsix
2018-06-14 21:16:10 +04:00
committed by jygaulier
parent 20fd33696b
commit 9809e8f176
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Alchemy/Phrasea/Controller/Root/LoginController.php
View File

@@ -552,6 +552,7 @@ class LoginController extends Controller
} while (null !== $this->getUserRepository()->findOneBy(['login' => $login])); } while (null !== $this->getUserRepository()->findOneBy(['login' => $login]));
$user = $this->getUserManipulator()->createUser($login, $this->getStringGenerator()->generateString(128)); $user = $this->getUserManipulator()->createUser($login, $this->getStringGenerator()->generateString(128));
$user->setGuest(true);
$invite_user = $this->getUserRepository()->findByLogin(User::USER_GUEST); $invite_user = $this->getUserRepository()->findByLogin(User::USER_GUEST);
$usr_base_ids = array_keys($this->getAclForUser($user)->get_granted_base()); $usr_base_ids = array_keys($this->getAclForUser($user)->get_granted_base());

4
lib/Alchemy/Phrasea/Helper/User/Manage.php
View File

@@ -91,7 +91,7 @@ class Manage extends Helper
'sbas_id' => $this->request->get('sbas_id'), 'sbas_id' => $this->request->get('sbas_id'),
'base_id' => $this->request->get('base_id'), 'base_id' => $this->request->get('base_id'),
'last_model' => $this->request->get('last_model'), 'last_model' => $this->request->get('last_model'),
'show_special_users' => $this->request->get('show_special_users') ? true : false, 'filter_guest_user' => $this->request->get('filter_guest_user') ? true : false,
'srt' => $this->request->get("srt", \User_Query::SORT_CREATIONDATE), 'srt' => $this->request->get("srt", \User_Query::SORT_CREATIONDATE),
'ord' => $this->request->get("ord", \User_Query::ORD_DESC), 'ord' => $this->request->get("ord", \User_Query::ORD_DESC),
'per_page' => $results_quantity, 'per_page' => $results_quantity,
@@ -110,7 +110,7 @@ class Manage extends Helper
->last_model_is($this->query_parms['last_model']) ->last_model_is($this->query_parms['last_model'])
->get_inactives($this->query_parms['inactives']) ->get_inactives($this->query_parms['inactives'])
->include_templates(true) ->include_templates(true)
->include_special_users($this->query_parms['show_special_users']) ->include_invite($this->query_parms['filter_guest_user'])
->on_bases_where_i_am($this->app->getAclForUser($this->app->getAuthenticatedUser()), [\ACL::CANADMIN]) ->on_bases_where_i_am($this->app->getAclForUser($this->app->getAuthenticatedUser()), [\ACL::CANADMIN])
->limit($offset_start, $results_quantity) ->limit($offset_start, $results_quantity)
->execute(); ->execute();

2
lib/classes/User/Query.php
View File

@@ -812,7 +812,7 @@ class User_Query
WHERE 1 '; WHERE 1 ';
if (! $this->include_special_users) { if (! $this->include_special_users) {
$sql .= ' AND Users.login != "autoregister" AND Users.login NOT LIKE "guest%" '; $sql .= ' AND Users.login != "autoregister"';
} }
$sql .= ' AND Users.deleted="0" '; $sql .= ' AND Users.deleted="0" ';

2
templates/web/admin/users.html.twig
View File

@@ -35,7 +35,7 @@
<fieldset class="admin_head_opts"> <fieldset class="admin_head_opts">
<span class="checkbox"> <span class="checkbox">
{{ 'admin::userlist: filterguestuser' | trans }} {{ 'admin::userlist: filterguestuser' | trans }}
<input type="checkbox" name="show_special_users" {% if parm['show_special_users'] %} checked="checked" {% endif %} style="margin-left:10px" /> <input type="checkbox" name="filter_guest_user" {% if parm['filter_guest_user'] %} checked="checked" {% endif %} style="margin-left:10px" />
</span> </span>
<br/> <br/>
<span>{{ 'Filter' | trans }}</span> <span>{{ 'Filter' | trans }}</span>