mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00
Code Issues 32 Releases Wiki Activity

[per-object-permissions] Added some more comments

Browse Source 
[per-object-permissions] Added "hidden" option to admin options, this is to allow an object to have admin options but not be shown on the admin interface. Might not be wanted, and can be removed if that is the case.

git-svn-id: http://code.djangoproject.com/svn/django/branches/per-object-permissions@3622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Christopher Long 2006-08-20 18:00:07 +00:00
parent 6bed9e0b2c
commit 722d0dbf42
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/contrib/auth/models.py
View File

@ -73,9 +73,11 @@ class RowLevelPermissionManager(models.Manager):
return ret_dict return ret_dict
class RowLevelPermission(models.Model): class RowLevelPermission(models.Model):
""" Similiar to permissions but works on instances of objects instead of types. """
Similiar to permissions but works on instances of objects instead of types.
This uses generic relations to minimize the number of tables, and connects to the This uses generic relations to minimize the number of tables, and connects to the
permissions table using a many to one relation. permissions table using a many to one relation.
""" """
model_id = models.PositiveIntegerField("'Model' ID") model_id = models.PositiveIntegerField("'Model' ID")
model_ct = models.ForeignKey(ContentType, verbose_name="'Model' content type", related_name="model_ct") model_ct = models.ForeignKey(ContentType, verbose_name="'Model' content type", related_name="model_ct")
@ -94,6 +96,8 @@ class RowLevelPermission(models.Model):
verbose_name_plural = _('row level permissions') verbose_name_plural = _('row level permissions')
unique_together = (('model_ct', 'model_id', 'owner_id', 'owner_ct', 'permission'),) unique_together = (('model_ct', 'model_id', 'owner_id', 'owner_ct', 'permission'),)
class Admin:
hidden = True
def __str__(self): def __str__(self):
return "%s | %s:%s | %s:%s" % (self.permission, self.owner_ct, self.owner, self.model_ct, self.model) return "%s | %s:%s | %s:%s" % (self.permission, self.owner_ct, self.owner, self.model_ct, self.model)
@ -319,6 +323,7 @@ class User(models.Model):
if self.is_superuser: if self.is_superuser:
return True return True
if object and object._meta.row_level_permissions: if object and object._meta.row_level_permissions:
#Since we use the content type for row level perms, we don't need the application name
permission_str = perm[perm.index('.')+1:] permission_str = perm[perm.index('.')+1:]
row_level_permission = self.check_row_level_permission(permission_str, object) row_level_permission = self.check_row_level_permission(permission_str, object)
if row_level_permission is not None: if row_level_permission is not None:

3
django/db/models/options.py
View File

@ -203,7 +203,7 @@ class AdminOptions(object):
def __init__(self, fields=None, js=None, list_display=None, list_display_links=None, list_filter=None, def __init__(self, fields=None, js=None, list_display=None, list_display_links=None, list_filter=None,
date_hierarchy=None, save_as=False, ordering=None, search_fields=None, date_hierarchy=None, save_as=False, ordering=None, search_fields=None,
save_on_top=False, list_select_related=False, manager=None, list_per_page=100, save_on_top=False, list_select_related=False, manager=None, list_per_page=100,
grant_change_row_level_perm=False, grant_delete_row_level_perm=False): grant_change_row_level_perm=False, grant_delete_row_level_perm=False, hidden=False):
self.fields = fields self.fields = fields
self.js = js or [] self.js = js or []
self.list_display = list_display or ['__str__'] self.list_display = list_display or ['__str__']
@ -218,6 +218,7 @@ class AdminOptions(object):
self.manager = manager or Manager() self.manager = manager or Manager()
self.grant_change_row_level_perm=grant_change_row_level_perm self.grant_change_row_level_perm=grant_change_row_level_perm
self.grant_delete_row_level_perm=grant_delete_row_level_perm self.grant_delete_row_level_perm=grant_delete_row_level_perm
self.hidden = hidden
def get_field_sets(self, opts): def get_field_sets(self, opts):
"Returns a list of AdminFieldSet objects for this AdminOptions object." "Returns a list of AdminFieldSet objects for this AdminOptions object."