aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-10-07 16:35:01 +0200
committerGitHub <noreply@github.com>2016-10-07 16:35:01 +0200
commit499ba4cb2fb6c53982923d53c8a72ba8594dc8c7 (patch)
tree1b2c6de91bd3977b2fa404055c86505eb776d1cd
parentaa88d2494b1f574afcb5ab9caf098d8f0253ec33 (diff)
parent5e7786f3c4f279f78ff80df53480e21b50c3396b (diff)
downloadwallabag-499ba4cb2fb6c53982923d53c8a72ba8594dc8c7.tar.gz
wallabag-499ba4cb2fb6c53982923d53c8a72ba8594dc8c7.tar.zst
wallabag-499ba4cb2fb6c53982923d53c8a72ba8594dc8c7.zip
Merge pull request #2388 from wallabag/fix-2factor-user-admin
Fixed two-factor checkbox display in user admin panel
-rw-r--r--src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig2
-rw-r--r--tests/Wallabag/UserBundle/Controller/ManageControllerTest.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
index d5cf99c3..67843f20 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
@@ -68,7 +68,7 @@
68 <br/> 68 <br/>
69 69
70 {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} 70 {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
71 {{ form_rest(edit_form) }} 71 {{ form_widget(edit_form._token) }}
72 </form> 72 </form>
73 <p> 73 <p>
74 {{ form_start(delete_form) }} 74 {{ form_start(delete_form) }}
diff --git a/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php b/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php
index 19b824b8..243a4459 100644
--- a/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php
+++ b/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php
@@ -23,7 +23,7 @@ class ManageControllerTest extends WallabagCoreTestCase
23 23
24 // Create a new user in the database 24 // Create a new user in the database
25 $crawler = $client->request('GET', '/users/'); 25 $crawler = $client->request('GET', '/users/');
26 $this->assertEquals(200, $client->getResponse()->getStatusCode(), "Unexpected HTTP status code for GET /users/"); 26 $this->assertEquals(200, $client->getResponse()->getStatusCode(), 'Unexpected HTTP status code for GET /users/');
27 $crawler = $client->click($crawler->selectLink('user.list.create_new_one')->link()); 27 $crawler = $client->click($crawler->selectLink('user.list.create_new_one')->link());
28 28
29 // Fill in the form and submit it 29 // Fill in the form and submit it