# HG changeset patch # User Marcin Kuzminski # Date 1365515542 -7200 # Node ID 21412a6c3854f80a27991be5c499272ed64c18e0 # Parent e42e1d4e1c473a29024845e88530f5a8ee2f7ce1 throw 404s on empty show functions in ADMIN controllers diff -r e42e1d4e1c47 -r 21412a6c3854 rhodecode/controllers/admin/permissions.py --- a/rhodecode/controllers/admin/permissions.py Tue Apr 09 15:39:45 2013 +0200 +++ b/rhodecode/controllers/admin/permissions.py Tue Apr 09 15:52:22 2013 +0200 @@ -38,7 +38,7 @@ from rhodecode.lib.base import BaseController, render from rhodecode.model.forms import DefaultPermissionsForm from rhodecode.model.permission import PermissionModel -from rhodecode.model.db import User, UserIpMap +from rhodecode.model.db import User, UserIpMap, Permission from rhodecode.model.meta import Session log = logging.getLogger(__name__) @@ -154,6 +154,7 @@ def show(self, id, format='html'): """GET /permissions/id: Show a specific item""" # url('permission', id=ID) + Permission.get_or_404(-1) def edit(self, id, format='html'): """GET /permissions/id/edit: Form to edit an existing item""" diff -r e42e1d4e1c47 -r 21412a6c3854 rhodecode/controllers/admin/users.py --- a/rhodecode/controllers/admin/users.py Tue Apr 09 15:39:45 2013 +0200 +++ b/rhodecode/controllers/admin/users.py Tue Apr 09 15:52:22 2013 +0200 @@ -221,6 +221,7 @@ def show(self, id, format='html'): """GET /users/id: Show a specific item""" # url('user', id=ID) + User.get_or_404(-1) def edit(self, id, format='html'): """GET /users/id/edit: Form to edit an existing item"""