kallithea Changeset - 60bf1b171015

Changeset - 60bf1b171015

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

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

routing: use POST to 'edit_user_ips_update' instead of PUT

5 files changed with 6 insertions and 6 deletions:

kallithea/config/routing.py

kallithea/templates/admin/permissions/permissions_ips.html

kallithea/templates/admin/users/user_edit_ips.html

kallithea/tests/functional/test_admin_permissions.py

kallithea/tests/functional/test_admin_users.py

0 comments (0 inline, 0 general)

kallithea/config/routing.py

➞

Show inline comments

@@ @@ -206,14 +206,14 @@ def make_map(config): @@
                   action="add_email", conditions=dict(method=["PUT"]))
         m.connect("edit_user_emails_delete", "/users/{id}/edit/emails/delete",
                   action="delete_email", conditions=dict(method=["POST"]))
         m.connect("edit_user_ips", "/users/{id}/edit/ips",
                   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_update", "/users/{id}/edit/ips",
                   action="add_ip", conditions=dict(method=["POST"]))
         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,
                         controller='admin/user_groups') as m:

kallithea/templates/admin/permissions/permissions_ips.html

➞

Show inline comments

@@ @@ -18,13 +18,13 @@ @@
        %else:
         <tr><td><div class="ip">${_('All IP addresses are allowed.')}</div></td></tr>
        %endif
       </table>
 </div>
-${h.form(url('edit_user_ips', id=c.user.user_id),method='put')}
+${h.form(url('edit_user_ips_update', id=c.user.user_id))}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="new_ip">${_('New IP address')}:</label>

kallithea/templates/admin/users/user_edit_ips.html

➞

Show inline comments

@@ @@ -30,13 +30,13 @@ @@
         <tr><td><div class="ip">${_('All IP addresses are allowed.')}</div></td></tr>
     %endif
   </table>
 </div>
 <div>
-    ${h.form(url('edit_user_ips', id=c.user.user_id),method='put')}
+    ${h.form(url('edit_user_ips_update', id=c.user.user_id))}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="new_ip">${_('New IP address')}:</label>

kallithea/tests/functional/test_admin_permissions.py

➞

Show inline comments

@@ @@ -16,13 +16,13 @@ class TestAdminPermissionsController(Tes @@
         # Test response...
         response.mustcontain('All IP addresses are allowed')
     def test_add_ips(self):
         self.log_user()
         default_user_id = User.get_default_user().user_id
-        response = self.app.put(url('edit_user_ips', id=default_user_id),
+        response = self.app.post(url('edit_user_ips_update', id=default_user_id),
                                  params=dict(new_ip='127.0.0.0/24',
                                  _authentication_token=self.authentication_token()))
         # sleep more than beaker.cache.sql_cache_short.expire to expire user cache
         time.sleep(1.5)
         self.app.get(url('admin_permissions_ips'), status=302)

kallithea/tests/functional/test_admin_users.py

➞

Show inline comments

@@ @@ -398,13 +398,13 @@ class TestAdminUsersController(TestContr @@
     ])
     def test_add_ip(self, test_name, ip, ip_range, failure):
         self.log_user()
         user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
         user_id = user.user_id
-        response = self.app.put(url('edit_user_ips', id=user_id),
+        response = self.app.post(url('edit_user_ips_update', id=user_id),
                                 params=dict(new_ip=ip, _authentication_token=self.authentication_token()))
         if failure:
             self.checkSessionFlash(response, 'Please enter a valid IPv4 or IPv6 address')
             response = self.app.get(url('edit_user_ips', id=user_id))
             response.mustcontain(no=[ip])

0 comments (0 inline, 0 general)