kallithea Changeset - 5e69685567c3

Changeset - 5e69685567c3

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 9 years ago 2016-08-04 14:23:36
madski@unity3d.com

routing: use POST to 'delete_users_group' instead of DELETE

4 files changed with 12 insertions and 12 deletions:

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

0 comments (0 inline, 0 general)

kallithea/config/routing.py

➞

Show inline comments

@@ @@ -222,14 +222,14 @@ def make_map(config): @@
         m.connect("users_groups", "/user_groups",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("new_users_group", "/user_groups/new",
                   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)
         #EXTRAS USER GROUP ROUTES
         m.connect("edit_user_group_default_perms", "/user_groups/{id}/edit/default_perms",

kallithea/templates/admin/user_groups/user_group_edit_advanced.html

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ @@
 %for dt, dd, tt in elems:
   <dt style="width:150px; text-align: left">${dt}:</dt>
   <dd style="margin-left: 160px" title="${tt}">${dd}</dd>
 %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>
         ${_('Delete this user group')}
     </button>
 ${h.end_form()}

kallithea/templates/data_table/_dt_elements.html

➞

Show inline comments

@@ @@ -165,13 +165,13 @@ @@
     <a href="${h.url('edit_users_group', id=user_group_id)}" title="${_('Edit')}">
     <i class="icon-pencil"></i>
      ${h.submit('edit_%s' % user_group_name,_('Edit'),class_="action_button", id_="submit_user_group_edit")}
     </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+"');")}
     ${h.end_form()}
  </div>
 </%def>

kallithea/tests/functional/test_admin_user_groups.py

➞

Show inline comments

@@ @@ -51,14 +51,14 @@ class TestAdminUsersGroupsController(Tes @@
         self.checkSessionFlash(response,
                                'Created user group ')
         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()
         assert gr == None
@@ @@ -114,14 +114,14 @@ class TestAdminUsersGroupsController(Tes @@
                     [ug.users_group_id, p2.permission_id],
                     [ug.users_group_id, p3.permission_id]])
         # 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()
         assert gr == None
         p = Permission.get_by_key('hg.create.repository')
@@ @@ -181,14 +181,14 @@ class TestAdminUsersGroupsController(Tes @@
                     [ug.users_group_id, p2.permission_id],
                     [ug.users_group_id, p3.permission_id]])
         # 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()
         assert gr == None
@@ @@ -197,8 +197,8 @@ class TestAdminUsersGroupsController(Tes @@
             .filter(UserGroupToPerm.users_group_id == ugid).all()
         perms = [[x.users_group_id,
                   x.permission_id, ] for x in perms]
         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()))

0 comments (0 inline, 0 general)