From cda0662311c6ae95682d102d4c528edfc71f7c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 28 Nov 2016 12:44:17 +0100
Subject: Removed FOSUser attributes removed in alpha4 See
 https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Upgrade.md\#200-alpha3-to-200-alpha4

---
 src/Wallabag/UserBundle/Form/UserType.php                      | 4 ----
 src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig  | 8 --------
 src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig | 2 --
 3 files changed, 14 deletions(-)

(limited to 'src/Wallabag/UserBundle')

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
                 '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',
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 @@
                                     </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">
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 @@
                                     <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>
-- 
cgit v1.2.3