# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1470313416 -7200
# Node ID 4b4aab8082b7683350385978c034445ccef52faf
# Parent  073cf19b50671cf39a06af29ad9f94c3ef8e40ad
routing: introduce 'edit_user_ips_delete' url and use POST instead of DELETE

diff -r 073cf19b5067 -r 4b4aab8082b7 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
@@ -212,8 +212,8 @@
                   action="edit_ips", conditions=dict(method=["GET"]))
         m.connect("edit_user_ips", "/users/{id}/edit/ips",
                   action="add_ip", conditions=dict(method=["PUT"]))
-        m.connect("edit_user_ips", "/users/{id}/edit/ips",
-                  action="delete_ip", conditions=dict(method=["DELETE"]))
+        m.connect("edit_user_ips_delete", "/users/{id}/edit/ips/delete",
+                  action="delete_ip", conditions=dict(method=["POST"]))
 
     #ADMIN USER GROUPS REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
diff -r 073cf19b5067 -r 4b4aab8082b7 kallithea/templates/admin/permissions/permissions_ips.html
--- a/kallithea/templates/admin/permissions/permissions_ips.html	Thu Aug 04 14:23:36 2016 +0200
+++ b/kallithea/templates/admin/permissions/permissions_ips.html	Thu Aug 04 14:23:36 2016 +0200
@@ -6,7 +6,7 @@
               <td><div class="ip">${ip.ip_addr}</div></td>
               <td><div class="ip">${h.ip_range(ip.ip_addr)}</div></td>
               <td>
-                ${h.form(url('edit_user_ips', id=c.user.user_id),method='delete')}
+                ${h.form(url('edit_user_ips_delete', id=c.user.user_id))}
                     ${h.hidden('del_ip_id',ip.ip_id)}
                     ${h.hidden('default_user', 'True')}
                     <i class="icon-minus-circled" style="color:#FF4444"></i> ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id,
diff -r 073cf19b5067 -r 4b4aab8082b7 kallithea/templates/admin/users/user_edit_ips.html
--- a/kallithea/templates/admin/users/user_edit_ips.html	Thu Aug 04 14:23:36 2016 +0200
+++ b/kallithea/templates/admin/users/user_edit_ips.html	Thu Aug 04 14:23:36 2016 +0200
@@ -16,7 +16,7 @@
             <td><div class="ip">${ip.ip_addr}</div></td>
             <td><div class="ip">${h.ip_range(ip.ip_addr)}</div></td>
             <td>
-                ${h.form(url('edit_user_ips', id=c.user.user_id),method='delete')}
+                ${h.form(url('edit_user_ips_delete', id=c.user.user_id))}
                     ${h.hidden('del_ip_id',ip.ip_id)}
                     <i class="icon-minus-circled" style="color:#FF4444"></i>
                     ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id,
diff -r 073cf19b5067 -r 4b4aab8082b7 kallithea/tests/functional/test_admin_permissions.py
--- a/kallithea/tests/functional/test_admin_permissions.py	Thu Aug 04 14:23:36 2016 +0200
+++ b/kallithea/tests/functional/test_admin_permissions.py	Thu Aug 04 14:23:36 2016 +0200
@@ -38,9 +38,8 @@
         del_ip_id = UserIpMap.query().filter(UserIpMap.user_id ==
                                              default_user_id).first().ip_id
 
-        response = self.app.post(url('edit_user_ips', id=default_user_id),
-                                 params=dict(_method='delete',
-                                             del_ip_id=del_ip_id,
+        response = self.app.post(url('edit_user_ips_delete', id=default_user_id),
+                                 params=dict(del_ip_id=del_ip_id,
                                              _authentication_token=self.authentication_token()),
                                  extra_environ={'REMOTE_ADDR': '127.0.0.1'})
 
diff -r 073cf19b5067 -r 4b4aab8082b7 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
@@ -434,8 +434,8 @@
         response.mustcontain(ip)
         response.mustcontain(ip_range)
 
-        self.app.post(url('edit_user_ips', id=user_id),
-                      params=dict(_method='delete', del_ip_id=new_ip_id, _authentication_token=self.authentication_token()))
+        self.app.post(url('edit_user_ips_delete', id=user_id),
+                      params=dict(del_ip_id=new_ip_id, _authentication_token=self.authentication_token()))
 
         response = self.app.get(url('edit_user_ips', id=user_id))
         response.mustcontain('All IP addresses are allowed')