jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

do not require user_preference permission when creating new user (#3474)

Browse Source
This commit is contained in:
Kevin Papst
2022-08-16 21:13:26 +02:00
committed by GitHub
parent 303ec5be11
commit 1c613d0a52
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/API/UserController.php
View File

@@ -217,7 +217,7 @@ final class UserController extends BaseApiController
$form = $this->createForm(UserApiCreateForm::class, $user, [ $form = $this->createForm(UserApiCreateForm::class, $user, [
'include_roles' => $this->isGranted('roles', $user), 'include_roles' => $this->isGranted('roles', $user),
'include_active_flag' => true, 'include_active_flag' => true,
'include_preferences' => $this->isGranted('preferences', $user), 'include_preferences' => true,
]); ]);
$form->submit($request->request->all()); $form->submit($request->request->all());

2
src/Controller/UserController.php
View File

@@ -241,7 +241,7 @@ final class UserController extends AbstractController
'action' => $this->generateUrl('admin_user_create'), 'action' => $this->generateUrl('admin_user_create'),
'method' => 'POST', 'method' => 'POST',
'include_active_flag' => true, 'include_active_flag' => true,
'include_preferences' => $this->isGranted('preferences', $user), 'include_preferences' => true,
'include_add_more' => true, 'include_add_more' => true,
'include_teams' => $this->isGranted('teams_other_profile'), 'include_teams' => $this->isGranted('teams_other_profile'),
'include_roles' => $this->isGranted('roles_other_profile'), 'include_roles' => $this->isGranted('roles_other_profile'),

2
templates/user/create.html.twig
View File

@@ -44,6 +44,7 @@
</div> </div>
</div> </div>
{% if form.language is defined and form.timezone is defined %}
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
{{ form_row(form.language) }} {{ form_row(form.language) }}
@@ -52,6 +53,7 @@
{{ form_row(form.timezone) }} {{ form_row(form.timezone) }}
</div> </div>
</div> </div>
{% endif %}
{% if form.teams is defined or form.roles is defined %} {% if form.teams is defined or form.roles is defined %}
{% set length = 12 %} {% set length = 12 %}