diff --git a/kallithea/config/routing.py b/kallithea/config/routing.py --- a/kallithea/config/routing.py +++ b/kallithea/config/routing.py @@ -205,8 +205,8 @@ def make_map(config): 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"])) diff --git a/kallithea/templates/admin/users/user_edit_emails.html b/kallithea/templates/admin/users/user_edit_emails.html --- a/kallithea/templates/admin/users/user_edit_emails.html +++ b/kallithea/templates/admin/users/user_edit_emails.html @@ -17,7 +17,7 @@ %endif
${em.email}
- ${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)} ${h.submit('remove_',_('Delete'),id="remove_email_%s" % em.email_id, diff --git a/kallithea/tests/functional/test_admin_users.py b/kallithea/tests/functional/test_admin_users.py --- a/kallithea/tests/functional/test_admin_users.py +++ b/kallithea/tests/functional/test_admin_users.py @@ -587,8 +587,8 @@ class TestAdminUsersControllerForDefault 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