pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Removed FOSUser attributes removed in alpha4

Browse Source 
See https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Upgrade.md\#200-alpha3-to-200-alpha4
This commit is contained in:
Nicolas Lœuillet
2016-11-28 12:44:17 +01:00
parent 5b644798a0
commit cda0662311
16 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Wallabag/UserBundle/Form/UserType.php
View File

@ -35,10 +35,6 @@ class UserType extends AbstractType
'required' => false,
'label' => 'user.form.enabled_label',
])
->add('locked', CheckboxType::class, [
'required' => false,
'label' => 'user.form.locked_label',
])
->add('twoFactorAuthentication', CheckboxType::class, [
'required' => false,
'label' => 'user.form.twofactor_label',

8
src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
View File

@ -47,14 +47,6 @@
</div>
</div>
<div class="row">
<div class="input-field col s12">
{{ form_widget(edit_form.locked) }}
{{ form_label(edit_form.locked) }}
{{ form_errors(edit_form.locked) }}
</div>
</div>
{% if twofactor_auth %}
<div class="row">
<div class="input-field col s12">

2
src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
View File

@ -17,7 +17,6 @@
<th>{{ 'user.form.username_label'|trans }}</th>
<th>{{ 'user.form.email_label'|trans }}</th>
<th>{{ 'user.form.last_login_label'|trans }}</th>
<th>{{ 'user.form.locked_label'|trans }}</th>
<th>{{ 'user.list.actions'|trans }}</th>
</tr>
</thead>
@ -27,7 +26,6 @@
<td>{{ user.username }}</td>
<td>{{ user.email }}</td>
<td>{% if user.lastLogin %}{{ user.lastLogin|date('Y-m-d H:i:s') }}{% endif %}</td>
<td>{% if user.locked %}{{ 'user.list.yes'|trans }}{% else %}{{ 'user.list.no'|trans }}{% endif %}</td>
<td>
<a href="{{ path('user_edit', { 'id': user.id }) }}">{{ 'user.list.edit_action'|trans }}</a>
</td>