Mercurial > kallithea
changeset 6070:4ebce2642888
controllers: remove some empty controllers, their "tests", and their unused routing
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 04 Aug 2016 14:23:36 +0200 |
| parents | c0a3519e7d2c |
| children | 32b674ab4878 |
| files | kallithea/config/routing.py kallithea/controllers/admin/notifications.py kallithea/controllers/admin/user_groups.py kallithea/controllers/admin/users.py kallithea/tests/functional/test_admin_user_groups.py kallithea/tests/functional/test_admin_users.py |
| diffstat | 6 files changed, 0 insertions(+), 58 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 @@ -190,8 +190,6 @@ action="delete", conditions=dict(method=["DELETE"])) m.connect("edit_user", "/users/{id}/edit", action="edit", conditions=dict(method=["GET"])) - m.connect("user", "/users/{id}", - action="show", conditions=dict(method=["GET"])) #EXTRAS USER ROUTES m.connect("edit_user_advanced", "/users/{id}/edit/advanced", @@ -241,8 +239,6 @@ m.connect("edit_users_group", "/user_groups/{id}/edit", action="edit", conditions=dict(method=["GET"]), function=check_user_group) - m.connect("users_group", "/user_groups/{id}", - action="show", conditions=dict(method=["GET"])) #EXTRAS USER GROUP ROUTES m.connect("edit_user_group_default_perms", "/user_groups/{id}/edit/default_perms", @@ -275,13 +271,9 @@ action="permission_globals", conditions=dict(method=["GET"])) m.connect("admin_permissions_ips", "/permissions/ips", - action="permission_ips", conditions=dict(method=["POST"])) - m.connect("admin_permissions_ips", "/permissions/ips", action="permission_ips", conditions=dict(method=["GET"])) m.connect("admin_permissions_perms", "/permissions/perms", - action="permission_perms", conditions=dict(method=["POST"])) - m.connect("admin_permissions_perms", "/permissions/perms", action="permission_perms", conditions=dict(method=["GET"])) @@ -384,26 +376,15 @@ with rmap.submapper(path_prefix=ADMIN_PREFIX, controller='admin/notifications') as m: m.connect("notifications", "/notifications", - action="create", conditions=dict(method=["POST"])) - m.connect("notifications", "/notifications", action="index", conditions=dict(method=["GET"])) m.connect("notifications_mark_all_read", "/notifications/mark_all_read", action="mark_all_read", conditions=dict(method=["GET"])) m.connect("formatted_notifications", "/notifications.{format}", action="index", conditions=dict(method=["GET"])) - m.connect("new_notification", "/notifications/new", - action="new", conditions=dict(method=["GET"])) - m.connect("formatted_new_notification", "/notifications/new.{format}", - action="new", conditions=dict(method=["GET"])) m.connect("/notifications/{notification_id}", action="update", conditions=dict(method=["PUT"])) m.connect("/notifications/{notification_id}", action="delete", conditions=dict(method=["DELETE"])) - m.connect("edit_notification", "/notifications/{notification_id}/edit", - action="edit", conditions=dict(method=["GET"])) - m.connect("formatted_edit_notification", - "/notifications/{notification_id}.{format}/edit", - action="edit", conditions=dict(method=["GET"])) m.connect("notification", "/notifications/{notification_id}", action="show", conditions=dict(method=["GET"])) m.connect("formatted_notification", "/notifications/{notification_id}.{format}",
--- a/kallithea/controllers/admin/notifications.py Thu Aug 04 14:23:36 2016 +0200 +++ b/kallithea/controllers/admin/notifications.py Thu Aug 04 14:23:36 2016 +0200 @@ -90,14 +90,6 @@ c.notifications = Page(notif, page=1, items_per_page=10) return render('admin/notifications/notifications_data.html') - def create(self): - """POST /_admin/notifications: Create a new item""" - # url('notifications') - - def new(self, format='html'): - """GET /_admin/notifications/new: Form to create a new item""" - # url('new_notification') - def update(self, notification_id): try: no = Notification.get(notification_id) @@ -146,7 +138,3 @@ c.notification = notification c.user = self.authuser return render('admin/notifications/show_notification.html') - - def edit(self, notification_id, format='html'): - """GET /_admin/notifications/id/edit: Form to edit an existing item""" - # url('edit_notification', notification_id=ID)
--- a/kallithea/controllers/admin/user_groups.py Thu Aug 04 14:23:36 2016 +0200 +++ b/kallithea/controllers/admin/user_groups.py Thu Aug 04 14:23:36 2016 +0200 @@ -226,10 +226,6 @@ category='error') raise HTTPFound(location=url('users_groups')) - def show(self, id, format='html'): - """GET /user_groups/id: Show a specific item""" - # url('users_group', id=ID) - @HasUserGroupPermissionAnyDecorator('usergroup.admin') def edit(self, id, format='html'): c.user_group = UserGroup.get_or_404(id)
--- a/kallithea/controllers/admin/users.py Thu Aug 04 14:23:36 2016 +0200 +++ b/kallithea/controllers/admin/users.py Thu Aug 04 14:23:36 2016 +0200 @@ -202,11 +202,6 @@ category='error') raise HTTPFound(location=url('users')) - def show(self, id, format='html'): - """GET /users/id: Show a specific item""" - # url('user', id=ID) - User.get_or_404(-1) - def _get_user_or_raise_if_default(self, id): try: return User.get_or_404(id, allow_default=False)
--- 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 @@ -202,18 +202,3 @@ def test_delete_browser_fakeout(self): response = self.app.post(url('users_group', id=1), params=dict(_method='delete', _authentication_token=self.authentication_token())) - - def test_show(self): - response = self.app.get(url('users_group', id=1)) - - def test_edit(self): - response = self.app.get(url('edit_users_group', id=1)) - - def test_assign_members(self): - pass - - def test_add_create_permission(self): - pass - - def test_revoke_members(self): - pass
--- 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 @@ -257,9 +257,6 @@ params={'_method': 'delete', '_authentication_token': self.authentication_token()}) self.checkSessionFlash(response, 'Successfully deleted user') - def test_show(self): - response = self.app.get(url('user', id=1)) - def test_edit(self): self.log_user() user = User.get_by_username(TEST_USER_ADMIN_LOGIN)