Mercurial > kallithea
changeset 6088:5e69685567c3
routing: use POST to 'delete_users_group' instead of DELETE
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 04 Aug 2016 14:23:36 +0200 |
| parents | 5f481679ed2b |
| children | 86ee450f8b2d |
| files | kallithea/config/routing.py kallithea/templates/admin/user_groups/user_group_edit_advanced.html kallithea/templates/data_table/_dt_elements.html kallithea/tests/functional/test_admin_user_groups.py |
| diffstat | 4 files changed, 12 insertions(+), 12 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 @@ -225,8 +225,8 @@ action="new", conditions=dict(method=["GET"])) m.connect("update_users_group", "/user_groups/{id}", action="update", conditions=dict(method=["PUT"])) - m.connect("delete_users_group", "/user_groups/{id}", - action="delete", conditions=dict(method=["DELETE"])) + m.connect("delete_users_group", "/user_groups/{id}/delete", + action="delete", conditions=dict(method=["POST"])) m.connect("edit_users_group", "/user_groups/{id}/edit", action="edit", conditions=dict(method=["GET"]), function=check_user_group)
--- a/kallithea/templates/admin/user_groups/user_group_edit_advanced.html Thu Aug 04 14:23:36 2016 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_edit_advanced.html Thu Aug 04 14:23:36 2016 +0200 @@ -14,7 +14,7 @@ %endfor </dl> -${h.form(h.url('users_group', id=c.user_group.users_group_id),method='delete')} +${h.form(h.url('delete_users_group', id=c.user_group.users_group_id))} <button class="btn btn-small btn-danger" type="submit" onclick="return confirm('${_('Confirm to delete this user group: %s') % c.user_group.users_group_name}');"> <i class="icon-minus-circled"></i>
--- a/kallithea/templates/data_table/_dt_elements.html Thu Aug 04 14:23:36 2016 +0200 +++ b/kallithea/templates/data_table/_dt_elements.html Thu Aug 04 14:23:36 2016 +0200 @@ -168,7 +168,7 @@ </a> </div> <div style="float:left" class="grid_delete"> - ${h.form(h.url('users_group', id=user_group_id),method='delete')} + ${h.form(h.url('delete_users_group', id=user_group_id))} <i class="icon-minus-circled" style="color:#FF4444"></i> ${h.submit('remove_',_('Delete'),id="remove_group_%s" % user_group_id, class_="action_button", onclick="return confirm('"+_('Confirm to delete this user group: %s') % user_group_name+"');")}
--- a/kallithea/tests/functional/test_admin_user_groups.py Thu Aug 04 14:23:36 2016 +0200 +++ b/kallithea/tests/functional/test_admin_user_groups.py Thu Aug 04 14:23:36 2016 +0200 @@ -54,8 +54,8 @@ gr = Session().query(UserGroup) \ .filter(UserGroup.users_group_name == users_group_name).one() - response = self.app.post(url('users_group', id=gr.users_group_id), - params={'_method': 'delete', '_authentication_token': self.authentication_token()}) + response = self.app.post(url('delete_users_group', id=gr.users_group_id), + params={'_authentication_token': self.authentication_token()}) gr = Session().query(UserGroup) \ .filter(UserGroup.users_group_name == users_group_name).scalar() @@ -117,8 +117,8 @@ # DELETE ! ug = UserGroup.get_by_group_name(users_group_name) ugid = ug.users_group_id - response = self.app.post(url('users_group', id=ug.users_group_id), - params={'_method': 'delete', '_authentication_token': self.authentication_token()}) + response = self.app.post(url('delete_users_group', id=ug.users_group_id), + params={'_authentication_token': self.authentication_token()}) response = response.follow() gr = Session().query(UserGroup) \ .filter(UserGroup.users_group_name == users_group_name).scalar() @@ -184,8 +184,8 @@ # DELETE ! ug = UserGroup.get_by_group_name(users_group_name) ugid = ug.users_group_id - response = self.app.post(url('users_group', id=ug.users_group_id), - params={'_method': 'delete', '_authentication_token': self.authentication_token()}) + response = self.app.post(url('delete_users_group', id=ug.users_group_id), + params={'_authentication_token': self.authentication_token()}) response = response.follow() gr = Session().query(UserGroup) \ .filter(UserGroup.users_group_name == @@ -200,5 +200,5 @@ assert perms == [] def test_delete_browser_fakeout(self): - response = self.app.post(url('users_group', id=1), - params=dict(_method='delete', _authentication_token=self.authentication_token())) + response = self.app.post(url('delete_users_group', id=1), + params=dict(_authentication_token=self.authentication_token()))