Mercurial > kallithea
changeset 6085:5e836bd9b5d4
routing: introduce 'edit_user_emails_delete' url and use POST instead of DELETE
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 04 Aug 2016 14:23:36 +0200 |
| parents | 74f880bfcb7b |
| children | ad41c9a72a88 |
| files | kallithea/config/routing.py kallithea/templates/admin/users/user_edit_emails.html kallithea/tests/functional/test_admin_users.py |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/config/routing.py Thu Aug 04 14:23:36 2016 +0200 +++ b/kallithea/config/routing.py Thu Aug 04 14:23:36 2016 +0200 @@ -205,8 +205,8 @@ action="edit_emails", conditions=dict(method=["GET"])) m.connect("edit_user_emails", "/users/{id}/edit/emails", action="add_email", conditions=dict(method=["PUT"])) - m.connect("edit_user_emails", "/users/{id}/edit/emails", - action="delete_email", conditions=dict(method=["DELETE"])) + m.connect("edit_user_emails_delete", "/users/{id}/edit/emails/delete", + action="delete_email", conditions=dict(method=["POST"])) m.connect("edit_user_ips", "/users/{id}/edit/ips", action="edit_ips", conditions=dict(method=["GET"]))
--- a/kallithea/templates/admin/users/user_edit_emails.html Thu Aug 04 14:23:36 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_emails.html Thu Aug 04 14:23:36 2016 +0200 @@ -17,7 +17,7 @@ %endif <td><div class="email">${em.email}</div></td> <td> - ${h.form(url('edit_user_emails', id=c.user.user_id),method='delete')} + ${h.form(url('edit_user_emails_delete', id=c.user.user_id))} ${h.hidden('del_email_id',em.email_id)} <i class="icon-minus-circled" style="color:#FF4444"></i> ${h.submit('remove_',_('Delete'),id="remove_email_%s" % em.email_id,
--- a/kallithea/tests/functional/test_admin_users.py Thu Aug 04 14:23:36 2016 +0200 +++ b/kallithea/tests/functional/test_admin_users.py Thu Aug 04 14:23:36 2016 +0200 @@ -587,8 +587,8 @@ def test_delete_emails_default_user(self): self.log_user() user = User.get_default_user() - response = self.app.post(url('edit_user_emails', id=user.user_id), - {'_method': 'delete', '_authentication_token': self.authentication_token()}, status=404) + response = self.app.post(url('edit_user_emails_delete', id=user.user_id), + {'_authentication_token': self.authentication_token()}, status=404) # IP addresses # Add/delete of IP addresses for the default user is used to maintain