diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-11-28 12:44:17 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-11-28 12:44:17 +0100 |
commit | cda0662311c6ae95682d102d4c528edfc71f7c99 (patch) | |
tree | e422b58521d7a0cb95b37242a9e3fcf969df679c /src/Wallabag/UserBundle | |
parent | 5b644798a09f87e07dde95a85ab283affd7b3659 (diff) | |
download | wallabag-cda0662311c6ae95682d102d4c528edfc71f7c99.tar.gz wallabag-cda0662311c6ae95682d102d4c528edfc71f7c99.tar.zst wallabag-cda0662311c6ae95682d102d4c528edfc71f7c99.zip |
Removed FOSUser attributes removed in alpha4
See https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Upgrade.md\#200-alpha3-to-200-alpha4
Diffstat (limited to 'src/Wallabag/UserBundle')
-rw-r--r-- | src/Wallabag/UserBundle/Form/UserType.php | 4 | ||||
-rw-r--r-- | src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig | 8 | ||||
-rw-r--r-- | src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig | 2 |
3 files changed, 0 insertions, 14 deletions
diff --git a/src/Wallabag/UserBundle/Form/UserType.php b/src/Wallabag/UserBundle/Form/UserType.php index cfa67793..d8cdbaf9 100644 --- a/src/Wallabag/UserBundle/Form/UserType.php +++ b/src/Wallabag/UserBundle/Form/UserType.php | |||
@@ -35,10 +35,6 @@ class UserType extends AbstractType | |||
35 | 'required' => false, | 35 | 'required' => false, |
36 | 'label' => 'user.form.enabled_label', | 36 | 'label' => 'user.form.enabled_label', |
37 | ]) | 37 | ]) |
38 | ->add('locked', CheckboxType::class, [ | ||
39 | 'required' => false, | ||
40 | 'label' => 'user.form.locked_label', | ||
41 | ]) | ||
42 | ->add('twoFactorAuthentication', CheckboxType::class, [ | 38 | ->add('twoFactorAuthentication', CheckboxType::class, [ |
43 | 'required' => false, | 39 | 'required' => false, |
44 | 'label' => 'user.form.twofactor_label', | 40 | 'label' => 'user.form.twofactor_label', |
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig index 67843f20..3ffd15f5 100644 --- a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig | |||
@@ -47,14 +47,6 @@ | |||
47 | </div> | 47 | </div> |
48 | </div> | 48 | </div> |
49 | 49 | ||
50 | <div class="row"> | ||
51 | <div class="input-field col s12"> | ||
52 | {{ form_widget(edit_form.locked) }} | ||
53 | {{ form_label(edit_form.locked) }} | ||
54 | {{ form_errors(edit_form.locked) }} | ||
55 | </div> | ||
56 | </div> | ||
57 | |||
58 | {% if twofactor_auth %} | 50 | {% if twofactor_auth %} |
59 | <div class="row"> | 51 | <div class="row"> |
60 | <div class="input-field col s12"> | 52 | <div class="input-field col s12"> |
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig index 996bdb1a..daba29e4 100644 --- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig | |||
@@ -17,7 +17,6 @@ | |||
17 | <th>{{ 'user.form.username_label'|trans }}</th> | 17 | <th>{{ 'user.form.username_label'|trans }}</th> |
18 | <th>{{ 'user.form.email_label'|trans }}</th> | 18 | <th>{{ 'user.form.email_label'|trans }}</th> |
19 | <th>{{ 'user.form.last_login_label'|trans }}</th> | 19 | <th>{{ 'user.form.last_login_label'|trans }}</th> |
20 | <th>{{ 'user.form.locked_label'|trans }}</th> | ||
21 | <th>{{ 'user.list.actions'|trans }}</th> | 20 | <th>{{ 'user.list.actions'|trans }}</th> |
22 | </tr> | 21 | </tr> |
23 | </thead> | 22 | </thead> |
@@ -27,7 +26,6 @@ | |||
27 | <td>{{ user.username }}</td> | 26 | <td>{{ user.username }}</td> |
28 | <td>{{ user.email }}</td> | 27 | <td>{{ user.email }}</td> |
29 | <td>{% if user.lastLogin %}{{ user.lastLogin|date('Y-m-d H:i:s') }}{% endif %}</td> | 28 | <td>{% if user.lastLogin %}{{ user.lastLogin|date('Y-m-d H:i:s') }}{% endif %}</td> |
30 | <td>{% if user.locked %}{{ 'user.list.yes'|trans }}{% else %}{{ 'user.list.no'|trans }}{% endif %}</td> | ||
31 | <td> | 29 | <td> |
32 | <a href="{{ path('user_edit', { 'id': user.id }) }}">{{ 'user.list.edit_action'|trans }}</a> | 30 | <a href="{{ path('user_edit', { 'id': user.id }) }}">{{ 'user.list.edit_action'|trans }}</a> |
33 | </td> | 31 | </td> |