diff --git a/kallithea/config/routing.py b/kallithea/config/routing.py --- a/kallithea/config/routing.py +++ b/kallithea/config/routing.py @@ -190,7 +190,7 @@ def make_map(config): 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 --git a/kallithea/templates/admin/users/user_edit_api_keys.html b/kallithea/templates/admin/users/user_edit_api_keys.html --- a/kallithea/templates/admin/users/user_edit_api_keys.html +++ b/kallithea/templates/admin/users/user_edit_api_keys.html @@ -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 --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 @@ -458,7 +458,7 @@ class TestAdminUsersController(TestContr 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 @@ class TestAdminUsersController(TestContr 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 @@ class TestAdminUsersControllerForDefault 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()