# HG changeset patch # User Mads Kiilerich # Date 1470313416 -7200 # Node ID 23ff4e66391a221501ce5cc0e600c95a2062fc0b # Parent 50e370c70f095b35d6a385ac43482590db850ed6 routing: use POST to 'edit_user_api_keys_update' instead of PUT diff -r 50e370c70f09 -r 23ff4e66391a kallithea/config/routing.py --- 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 @@ -190,7 +190,7 @@ m.connect("edit_user_api_keys", "/users/{id}/edit/api_keys", action="edit_api_keys", conditions=dict(method=["GET"])) - m.connect("edit_user_api_keys", "/users/{id}/edit/api_keys", + m.connect("edit_user_api_keys_update", "/users/{id}/edit/api_keys", action="add_api_key", conditions=dict(method=["POST"])) m.connect("edit_user_api_keys_delete", "/users/{id}/edit/api_keys/delete", action="delete_api_key", conditions=dict(method=["POST"])) diff -r 50e370c70f09 -r 23ff4e66391a kallithea/templates/admin/users/user_edit_api_keys.html --- a/kallithea/templates/admin/users/user_edit_api_keys.html Thu Aug 04 14:23:36 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_api_keys.html Thu Aug 04 14:23:36 2016 +0200 @@ -52,7 +52,7 @@
- ${h.form(url('edit_user_api_keys', id=c.user.user_id), method='post')} + ${h.form(url('edit_user_api_keys_update', id=c.user.user_id))}
diff -r 50e370c70f09 -r 23ff4e66391a kallithea/tests/functional/test_admin_users.py --- 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 @@ -458,7 +458,7 @@ user = User.get_by_username(TEST_USER_REGULAR_LOGIN) user_id = user.user_id - response = self.app.post(url('edit_user_api_keys', id=user_id), + response = self.app.post(url('edit_user_api_keys_update', id=user_id), {'description': desc, 'lifetime': lifetime, '_authentication_token': self.authentication_token()}) self.checkSessionFlash(response, 'API key successfully created') try: @@ -476,7 +476,7 @@ user = User.get_by_username(TEST_USER_REGULAR_LOGIN) user_id = user.user_id - response = self.app.post(url('edit_user_api_keys', id=user_id), + response = self.app.post(url('edit_user_api_keys_update', id=user_id), {'description': 'desc', 'lifetime': -1, '_authentication_token': self.authentication_token()}) self.checkSessionFlash(response, 'API key successfully created') response = response.follow() @@ -549,8 +549,8 @@ def test_add_api_keys_default_user(self): self.log_user() user = User.get_default_user() - response = self.app.post(url('edit_user_api_keys', id=user.user_id), - {'_method': 'put', '_authentication_token': self.authentication_token()}, status=404) + response = self.app.post(url('edit_user_api_keys_update', id=user.user_id), + {'_authentication_token': self.authentication_token()}, status=404) def test_delete_api_keys_default_user(self): self.log_user()