mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-06 00:49:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2388 from wallabag/fix-2factor-user-admin

Browse source 
Fixed two-factor checkbox display in user admin panel
This commit is contained in:
Nicolas Lœuillet 2016-10-07 16:35:01 +02:00 committed by GitHub
commit 499ba4cb2f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
View file

@ -68,7 +68,7 @@
<br/> <br/>
{{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
{{ form_rest(edit_form) }} {{ form_widget(edit_form._token) }}
</form> </form>
<p> <p>
{{ form_start(delete_form) }} {{ form_start(delete_form) }}

2
tests/Wallabag/UserBundle/Controller/ManageControllerTest.php
View file

@ -23,7 +23,7 @@ class ManageControllerTest extends WallabagCoreTestCase
// Create a new user in the database // Create a new user in the database
$crawler = $client->request('GET', '/users/'); $crawler = $client->request('GET', '/users/');
$this->assertEquals(200, $client->getResponse()->getStatusCode(), "Unexpected HTTP status code for GET /users/"); $this->assertEquals(200, $client->getResponse()->getStatusCode(), 'Unexpected HTTP status code for GET /users/');
$crawler = $client->click($crawler->selectLink('user.list.create_new_one')->link()); $crawler = $client->click($crawler->selectLink('user.list.create_new_one')->link());
// Fill in the form and submit it // Fill in the form and submit it