diff options
| author | Christopher Long <indirecthit@gmail.com> | 2006-08-24 16:08:13 +0000 |
|---|---|---|
| committer | Christopher Long <indirecthit@gmail.com> | 2006-08-24 16:08:13 +0000 |
| commit | 5d37e5cd4c42e5dd831f927fd94329cb5c613d83 (patch) | |
| tree | bcc0e28e00db32819721894a2ee480786576556d | |
| parent | 7b2e3798f428536b5c56c863f0eef85c54224d51 (diff) | |
[per-object-permissions] Fixed a bug where delete row level permission was giving a PermissionDenied error falsely. (Missed adding the file to the commit)
git-svn-id: http://code.djangoproject.com/svn/django/branches/per-object-permissions@3656 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/views/row_level_permissions.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/django/contrib/admin/views/row_level_permissions.py b/django/contrib/admin/views/row_level_permissions.py index 6d63a9dbc2..624630fdaa 100644 --- a/django/contrib/admin/views/row_level_permissions.py +++ b/django/contrib/admin/views/row_level_permissions.py @@ -124,12 +124,14 @@ def delete_row_level_permission(request, app_label, model_name, object_id, ct_id ct = rlp.model_ct obj = rlp.model - if model_instance.id is not obj.id: + if not (model_instance.id == rlp.model_id): raise PermissionDenied if not request.user.has_perm(rlp._meta.app_label + '.' + rlp._meta.get_delete_permission()): + print "BAM" raise PermissionDenied if not request.user.has_perm(obj._meta.app_label + '.' + obj._meta.get_change_permission(), object=obj): + print "BOOM" raise PermissionDenied rlp.delete() |