kallithea Changeset - 50e370c70f09

Changeset - 50e370c70f09

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

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

routing: use POST to 'edit_user_perms_update' instead of PUT

6 files changed with 25 insertions and 27 deletions:

kallithea/config/routing.py

kallithea/templates/admin/user_groups/user_group_edit_default_perms.html

kallithea/templates/admin/users/user_edit_perms.html

kallithea/templates/base/default_perms_box.html

kallithea/tests/functional/test_admin_user_groups.py

kallithea/tests/functional/test_admin_users.py

0 comments (0 inline, 0 general)

kallithea/config/routing.py

➞

Show inline comments

@@ @@ -197,8 +197,8 @@ def make_map(config): @@
         m.connect("edit_user_perms", "/users/{id}/edit/permissions",
                   action="edit_perms", conditions=dict(method=["GET"]))
         m.connect("edit_user_perms", "/users/{id}/edit/permissions",
                   action="update_perms", conditions=dict(method=["PUT"]))
         m.connect("edit_user_perms_update", "/users/{id}/edit/permissions",
                   action="update_perms", conditions=dict(method=["POST"]))
         m.connect("edit_user_emails", "/users/{id}/edit/emails",
                   action="edit_emails", conditions=dict(method=["GET"]))
@@ @@ -234,8 +234,8 @@ def make_map(config): @@
         #EXTRAS USER GROUP ROUTES
         m.connect("edit_user_group_default_perms", "/user_groups/{id}/edit/default_perms",
                   action="edit_default_perms", conditions=dict(method=["GET"]))
         m.connect("edit_user_group_default_perms", "/user_groups/{id}/edit/default_perms",
                   action="update_default_perms", conditions=dict(method=["PUT"]))
         m.connect("edit_user_group_default_perms_update", "/user_groups/{id}/edit/default_perms",
                   action="update_default_perms", conditions=dict(method=["POST"]))
         m.connect("edit_user_group_perms", "/user_groups/{id}/edit/perms",

kallithea/templates/admin/user_groups/user_group_edit_default_perms.html

➞

Show inline comments

 <%namespace name="dpb" file="/base/default_perms_box.html"/>
-${dpb.default_perms_box(url('edit_user_group_default_perms', id=c.user_group.users_group_id))}
+${dpb.default_perms_box(url('edit_user_group_default_perms_update', id=c.user_group.users_group_id))}
 ## permissions overview
 <%namespace name="p" file="/base/perms_summary.html"/>

kallithea/templates/admin/users/user_edit_perms.html

➞

Show inline comments

 <%namespace name="dpb" file="/base/default_perms_box.html"/>
-${dpb.default_perms_box(url('edit_user_perms', id=c.user.user_id))}
+${dpb.default_perms_box(url('edit_user_perms_update', id=c.user.user_id))}
 ## permissions overview
 <%namespace name="p" file="/base/perms_summary.html"/>

kallithea/templates/base/default_perms_box.html

➞

Show inline comments

@@ @@ -5,7 +5,7 @@ @@
 <%def name="default_perms_box(form_url)">
-${h.form(form_url, method='put')}
 ${h.form(form_url)}
     <div class="form">
         <!-- fields -->
         <div class="fields">

kallithea/tests/functional/test_admin_user_groups.py

➞

Show inline comments

@@ @@ -76,8 +76,8 @@ class TestAdminUsersGroupsController(Tes @@
         self.checkSessionFlash(response,
                                'Created user group ')
         ## ENABLE REPO CREATE ON A GROUP
         response = self.app.put(url('edit_user_group_default_perms',
                                     id=ug.users_group_id),
         response = self.app.post(url('edit_user_group_default_perms_update',
                                      id=ug.users_group_id),
                                  {'create_repo_perm': True,
                                   '_authentication_token': self.authentication_token()})
         response.follow()
@@ @@ -95,8 +95,8 @@ class TestAdminUsersGroupsController(Tes @@
                     [ug.users_group_id, p3.permission_id]])
         ## DISABLE REPO CREATE ON A GROUP
         response = self.app.put(
             url('edit_user_group_default_perms', id=ug.users_group_id),
         response = self.app.post(
             url('edit_user_group_default_perms_update', id=ug.users_group_id),
             params={'_authentication_token': self.authentication_token()})
         response.follow()
@@ @@ -145,9 +145,9 @@ class TestAdminUsersGroupsController(Tes @@
         self.checkSessionFlash(response,
                                'Created user group ')
         ## ENABLE REPO CREATE ON A GROUP
         response = self.app.put(url('edit_user_group_default_perms',
                                     id=ug.users_group_id),
                                 {'fork_repo_perm': True, '_authentication_token': self.authentication_token()})
         response = self.app.post(url('edit_user_group_default_perms_update',
                                      id=ug.users_group_id),
                                  {'fork_repo_perm': True, '_authentication_token': self.authentication_token()})
         response.follow()
         ug = UserGroup.get_by_group_name(users_group_name)
@@ @@ -164,7 +164,7 @@ class TestAdminUsersGroupsController(Tes @@
                     [ug.users_group_id, p3.permission_id]])
         ## DISABLE REPO CREATE ON A GROUP
-        response = self.app.put(url('edit_user_group_default_perms', id=ug.users_group_id),
+        response = self.app.post(url('edit_user_group_default_perms_update', id=ug.users_group_id),
             params={'_authentication_token': self.authentication_token()})
         response.follow()

kallithea/tests/functional/test_admin_users.py

➞

Show inline comments

@@ @@ -278,9 +278,8 @@ class TestAdminUsersController(TestContr @@
             assert UserModel().has_perm(user, perm_none) == False
             assert UserModel().has_perm(user, perm_create) == False
             response = self.app.post(url('edit_user_perms', id=uid),
                                      params=dict(_method='put',
                                                  create_repo_perm=True,
             response = self.app.post(url('edit_user_perms_update', id=uid),
                                      params=dict(create_repo_perm=True,
                                                  _authentication_token=self.authentication_token()))
             perm_none = Permission.get_by_key('hg.create.none')
@@ @@ -309,8 +308,8 @@ class TestAdminUsersController(TestContr @@
             assert UserModel().has_perm(user, perm_none) == False
             assert UserModel().has_perm(user, perm_create) == False
             response = self.app.post(url('edit_user_perms', id=uid),
                                      params=dict(_method='put', _authentication_token=self.authentication_token()))
             response = self.app.post(url('edit_user_perms_update', id=uid),
                                      params=dict(_authentication_token=self.authentication_token()))
             perm_none = Permission.get_by_key('hg.create.none')
             perm_create = Permission.get_by_key('hg.create.repository')
@@ @@ -338,9 +337,8 @@ class TestAdminUsersController(TestContr @@
             assert UserModel().has_perm(user, perm_none) == False
             assert UserModel().has_perm(user, perm_fork) == False
             response = self.app.post(url('edit_user_perms', id=uid),
                                      params=dict(_method='put',
                                                  create_repo_perm=True,
             response = self.app.post(url('edit_user_perms_update', id=uid),
                                      params=dict(create_repo_perm=True,
                                                  _authentication_token=self.authentication_token()))
             perm_none = Permission.get_by_key('hg.create.none')
@@ @@ -369,8 +367,8 @@ class TestAdminUsersController(TestContr @@
             assert UserModel().has_perm(user, perm_none) == False
             assert UserModel().has_perm(user, perm_fork) == False
             response = self.app.post(url('edit_user_perms', id=uid),
                                      params=dict(_method='put', _authentication_token=self.authentication_token()))
             response = self.app.post(url('edit_user_perms_update', id=uid),
                                      params=dict(_authentication_token=self.authentication_token()))
             perm_none = Permission.get_by_key('hg.create.none')
             perm_create = Permission.get_by_key('hg.create.repository')
@@ @@ -569,8 +567,8 @@ class TestAdminUsersControllerForDefault @@
     def test_update_perms_default_user(self):
         self.log_user()
         user = User.get_default_user()
         response = self.app.post(url('edit_user_perms', id=user.user_id),
                  {'_method': 'put', '_authentication_token': self.authentication_token()}, status=404)
         response = self.app.post(url('edit_user_perms_update', id=user.user_id),
                  {'_authentication_token': self.authentication_token()}, status=404)
     # Emails
     def test_edit_emails_default_user(self):

0 comments (0 inline, 0 general)