aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-10-02 13:21:45 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-10-02 13:29:57 +0200
commitccc7faec094387681a59faa5ca79a86e33f06972 (patch)
tree138e9658b90da8f97dd75f70d9d719ddcbfb5719
parenteb4142e0afa5c83c9e301e38e57a72322be05e8c (diff)
downloadwallabag-ccc7faec094387681a59faa5ca79a86e33f06972.tar.gz
wallabag-ccc7faec094387681a59faa5ca79a86e33f06972.tar.zst
wallabag-ccc7faec094387681a59faa5ca79a86e33f06972.zip
Disabled delete button for the logged user
To avoid some bad things to happen…
-rw-r--r--src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig2
-rw-r--r--tests/Wallabag/UserBundle/Controller/ManageControllerTest.php11
2 files changed, 12 insertions, 1 deletions
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
index 5292ba78..d5cf99c3 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
@@ -72,7 +72,7 @@
72 </form> 72 </form>
73 <p> 73 <p>
74 {{ form_start(delete_form) }} 74 {{ form_start(delete_form) }}
75 <button onclick="return confirm('{{ 'user.form.delete_confirm'|trans|escape('js') }}')" type="submit" class="btn waves-effect waves-light red">{{ 'user.form.delete'|trans }}</button> 75 <button {% if app.user.id == user.id %}disabled="disabled"{% endif %} onclick="return confirm('{{ 'user.form.delete_confirm'|trans|escape('js') }}')" type="submit" class="btn waves-effect waves-light red">{{ 'user.form.delete'|trans }}</button>
76 {{ form_end(delete_form) }} 76 {{ form_end(delete_form) }}
77 </p> 77 </p>
78 <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('user_index') }}">{{ 'user.form.back_to_list'|trans }}</a></p> 78 <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('user_index') }}">{{ 'user.form.back_to_list'|trans }}</a></p>
diff --git a/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php b/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php
index 247eb6ba..19b824b8 100644
--- a/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php
+++ b/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php
@@ -68,4 +68,15 @@ class ManageControllerTest extends WallabagCoreTestCase
68 // Check the user has been delete on the list 68 // Check the user has been delete on the list
69 $this->assertNotRegExp('/Foo User/', $client->getResponse()->getContent()); 69 $this->assertNotRegExp('/Foo User/', $client->getResponse()->getContent());
70 } 70 }
71
72 public function testDeleteDisabledForLoggedUser()
73 {
74 $this->logInAs('admin');
75 $client = $this->getClient();
76
77 $crawler = $client->request('GET', '/users/'.$this->getLoggedInUserId().'/edit');
78 $disabled = $crawler->selectButton('user.form.delete')->extract('disabled');
79
80 $this->assertEquals('disabled', $disabled[0]);
81 }
71} 82}