aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/DoctrineMigrations/Version20161128131503.php61
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml1
-rw-r--r--src/Wallabag/UserBundle/Form/UserType.php4
-rw-r--r--src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig8
-rw-r--r--src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig2
-rw-r--r--tests/Wallabag/UserBundle/Controller/ManageControllerTest.php1
17 files changed, 62 insertions, 28 deletions
diff --git a/app/DoctrineMigrations/Version20161128131503.php b/app/DoctrineMigrations/Version20161128131503.php
new file mode 100644
index 00000000..f0e016c8
--- /dev/null
+++ b/app/DoctrineMigrations/Version20161128131503.php
@@ -0,0 +1,61 @@
1<?php
2
3namespace Application\Migrations;
4
5use Doctrine\DBAL\Migrations\AbstractMigration;
6use Doctrine\DBAL\Schema\Schema;
7use Symfony\Component\DependencyInjection\ContainerAwareInterface;
8use Symfony\Component\DependencyInjection\ContainerInterface;
9
10/**
11 * Removed locked, credentials_expire_at and expires_at.
12 */
13class Version20161128131503 extends AbstractMigration implements ContainerAwareInterface
14{
15 private $fields = [
16 'locked' => 'smallint',
17 'credentials_expire_at' => 'datetime',
18 'expires_at' => 'datetime',
19 ];
20
21 /**
22 * @var ContainerInterface
23 */
24 private $container;
25
26 public function setContainer(ContainerInterface $container = null)
27 {
28 $this->container = $container;
29 }
30
31 private function getTable($tableName)
32 {
33 return $this->container->getParameter('database_table_prefix').$tableName;
34 }
35
36 /**
37 * @param Schema $schema
38 */
39 public function up(Schema $schema)
40 {
41 $userTable = $schema->getTable($this->getTable('user'));
42
43 foreach ($this->fields as $field => $type) {
44 $this->skipIf(!$userTable->hasColumn($field), 'It seems that you already played this migration.');
45 $userTable->dropColumn($field);
46 }
47 }
48
49 /**
50 * @param Schema $schema
51 */
52 public function down(Schema $schema)
53 {
54 $userTable = $schema->getTable($this->getTable('user'));
55
56 foreach ($this->fields as $field => $type) {
57 $this->skipIf($userTable->hasColumn($field), 'It seems that you already played this migration.');
58 $userTable->addColumn($field, $type);
59 }
60 }
61}
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 8a20cbe0..c9e21959 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -503,7 +503,6 @@ user:
503 plain_password_label: '????' 503 plain_password_label: '????'
504 email_label: 'Emailadresse' 504 email_label: 'Emailadresse'
505 # enabled_label: 'Enabled' 505 # enabled_label: 'Enabled'
506 # locked_label: 'Locked'
507 # last_login_label: 'Last login' 506 # last_login_label: 'Last login'
508 # twofactor_label: Two factor authentication 507 # twofactor_label: Two factor authentication
509 # save: Save 508 # save: Save
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 68e9c333..b84bd9d3 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -503,7 +503,6 @@ user:
503 plain_password_label: '????' 503 plain_password_label: '????'
504 email_label: 'E-Mail-Adresse' 504 email_label: 'E-Mail-Adresse'
505 enabled_label: 'Aktiviert' 505 enabled_label: 'Aktiviert'
506 locked_label: 'Gesperrt'
507 last_login_label: 'Letzter Login' 506 last_login_label: 'Letzter Login'
508 twofactor_label: Zwei-Faktor-Authentifizierung 507 twofactor_label: Zwei-Faktor-Authentifizierung
509 save: Speichern 508 save: Speichern
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 9e13ad0e..4b92fe97 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -503,7 +503,6 @@ user:
503 plain_password_label: '????' 503 plain_password_label: '????'
504 email_label: 'Email' 504 email_label: 'Email'
505 enabled_label: 'Enabled' 505 enabled_label: 'Enabled'
506 locked_label: 'Locked'
507 last_login_label: 'Last login' 506 last_login_label: 'Last login'
508 twofactor_label: Two factor authentication 507 twofactor_label: Two factor authentication
509 save: Save 508 save: Save
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index b8764876..02ce7e19 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -503,7 +503,6 @@ user:
503 plain_password_label: '????' 503 plain_password_label: '????'
504 email_label: 'Email' 504 email_label: 'Email'
505 # enabled_label: 'Enabled' 505 # enabled_label: 'Enabled'
506 # locked_label: 'Locked'
507 # last_login_label: 'Last login' 506 # last_login_label: 'Last login'
508 # twofactor_label: Two factor authentication 507 # twofactor_label: Two factor authentication
509 # save: Save 508 # save: Save
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index e1bfcade..99c0f71b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -503,7 +503,6 @@ user:
503 plain_password_label: '????' 503 plain_password_label: '????'
504 email_label: 'نشانی ایمیل' 504 email_label: 'نشانی ایمیل'
505 # enabled_label: 'Enabled' 505 # enabled_label: 'Enabled'
506 # locked_label: 'Locked'
507 # last_login_label: 'Last login' 506 # last_login_label: 'Last login'
508 # twofactor_label: Two factor authentication 507 # twofactor_label: Two factor authentication
509 # save: Save 508 # save: Save
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 2e4f4f43..5579bf1f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -503,7 +503,6 @@ user:
503 plain_password_label: "Mot de passe en clair" 503 plain_password_label: "Mot de passe en clair"
504 email_label: "Adresse courriel" 504 email_label: "Adresse courriel"
505 enabled_label: "Activé" 505 enabled_label: "Activé"
506 locked_label: "Bloqué"
507 last_login_label: "Dernière connexion" 506 last_login_label: "Dernière connexion"
508 twofactor_label: "Double authentification" 507 twofactor_label: "Double authentification"
509 save: "Sauvegarder" 508 save: "Sauvegarder"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index d84f7dbf..92ccef68 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -503,7 +503,6 @@ user:
503 plain_password_label: '????' 503 plain_password_label: '????'
504 email_label: 'E-mail' 504 email_label: 'E-mail'
505 # enabled_label: 'Enabled' 505 # enabled_label: 'Enabled'
506 # locked_label: 'Locked'
507 # last_login_label: 'Last login' 506 # last_login_label: 'Last login'
508 # twofactor_label: Two factor authentication 507 # twofactor_label: Two factor authentication
509 # save: Save 508 # save: Save
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index f2215a07..9ef3b475 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -503,7 +503,6 @@ user:
503 plain_password_label: 'Senhal en clar' 503 plain_password_label: 'Senhal en clar'
504 email_label: 'Adreça de corrièl' 504 email_label: 'Adreça de corrièl'
505 enabled_label: 'Actiu' 505 enabled_label: 'Actiu'
506 locked_label: 'Varrolhat'
507 last_login_label: 'Darrièra connexion' 506 last_login_label: 'Darrièra connexion'
508 twofactor_label: 'Autentificacion doble-factor' 507 twofactor_label: 'Autentificacion doble-factor'
509 save: 'Enregistrar' 508 save: 'Enregistrar'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 9e6d3565..9e3726a5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -315,7 +315,7 @@ howto:
315 toggle_favorite: Oznacz wpis gwiazdką 315 toggle_favorite: Oznacz wpis gwiazdką
316 toggle_archive: Oznacz wpis jako przeczytany 316 toggle_archive: Oznacz wpis jako przeczytany
317 delete: Usuń wpis 317 delete: Usuń wpis
318 material_title: Skróty dostępne wyłącznie w motywie Material 318 material_title: Skróty dostępne wyłącznie w motywie Material
319 add_link: Dodaj nowy link 319 add_link: Dodaj nowy link
320 hide_form: Ukryj obecny formularz (wyszukiwania lub nowego linku) 320 hide_form: Ukryj obecny formularz (wyszukiwania lub nowego linku)
321 arrows_navigation: Nawiguj pomiędzy artykułami 321 arrows_navigation: Nawiguj pomiędzy artykułami
@@ -503,7 +503,6 @@ user:
503 plain_password_label: 'Jawne hasło' 503 plain_password_label: 'Jawne hasło'
504 email_label: 'Adres email' 504 email_label: 'Adres email'
505 enabled_label: 'Włączony' 505 enabled_label: 'Włączony'
506 locked_label: 'Zablokowany'
507 last_login_label: 'Ostatnie logowanie' 506 last_login_label: 'Ostatnie logowanie'
508 twofactor_label: Autoryzacja dwuetapowa 507 twofactor_label: Autoryzacja dwuetapowa
509 save: Zapisz 508 save: Zapisz
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 3dd6e7d8..abe51305 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -503,7 +503,6 @@ user:
503 plain_password_label: '????' 503 plain_password_label: '????'
504 email_label: 'E-mail' 504 email_label: 'E-mail'
505 enabled_label: 'Habilitado' 505 enabled_label: 'Habilitado'
506 locked_label: 'Travado'
507 last_login_label: 'Último login' 506 last_login_label: 'Último login'
508 twofactor_label: 'Autenticação de dois passos' 507 twofactor_label: 'Autenticação de dois passos'
509 save: 'Salvar' 508 save: 'Salvar'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 0386c0b6..88780b54 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -503,7 +503,6 @@ user:
503 plain_password_label: '????' 503 plain_password_label: '????'
504 email_label: 'E-mail' 504 email_label: 'E-mail'
505 # enabled_label: 'Enabled' 505 # enabled_label: 'Enabled'
506 # locked_label: 'Locked'
507 # last_login_label: 'Last login' 506 # last_login_label: 'Last login'
508 # twofactor_label: Two factor authentication 507 # twofactor_label: Two factor authentication
509 # save: Save 508 # save: Save
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 74601f4e..db0a9bbf 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -503,7 +503,6 @@ user:
503 plain_password_label: '????' 503 plain_password_label: '????'
504 email_label: 'E-posta' 504 email_label: 'E-posta'
505 # enabled_label: 'Enabled' 505 # enabled_label: 'Enabled'
506 # locked_label: 'Locked'
507 # last_login_label: 'Last login' 506 # last_login_label: 'Last login'
508 # twofactor_label: Two factor authentication 507 # twofactor_label: Two factor authentication
509 # save: Save 508 # save: Save
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>
diff --git a/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php b/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php
index 243a4459..4faddfc4 100644
--- a/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php
+++ b/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php
@@ -49,7 +49,6 @@ class ManageControllerTest extends WallabagCoreTestCase
49 'user[username]' => 'test_user', 49 'user[username]' => 'test_user',
50 'user[email]' => 'test@test.io', 50 'user[email]' => 'test@test.io',
51 'user[enabled]' => true, 51 'user[enabled]' => true,
52 'user[locked]' => false,
53 )); 52 ));
54 53
55 $client->submit($form); 54 $client->submit($form);