Changeset 3627

Timestamp:

08/20/06 17:17:01 (2 years ago)

Author:

clong

Message:

[per-object-permissions] Removed debug print statement in auth/models.py
[per-object-permissions] Added admin option: show_all_rows which by default is set to True. If False, it will only show the rows the user has permission for. Implemented the changes into change_list to allow this

Files:

• django/branches/per-object-permissions/django/contrib/admin/templatetags/adminapplist.py (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/admin/templatetags/admin_list.py (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/admin/views/main.py (modified) (5 diffs)
• django/branches/per-object-permissions/django/contrib/auth/models.py (modified) (1 diff)
• django/branches/per-object-permissions/django/db/models/options.py (modified) (2 diffs)

django/branches/per-object-permissions/django/contrib/admin/templatetags/adminapplist.py

@@ -28 +28 @@
-                    if m._meta.admin:
-                        if not m._meta.admin.hidden:
-
-
-
-
-
-
+
-                            perms = {
-                                'add': user.contains_permission("%s.%s" % (app_label, m._meta.get_add_permission()), m),

django/branches/per-object-permissions/django/contrib/admin/templatetags/admin_list.py

@@ -105 +105 @@
-    first = True
-    pk = cl.lookup_opts.pk.attname
+    if not cl.opts.admin.show_all_rows:
+        if not cl.user.has_perm(cl.opts.app_label + "." + cl.opts.get_change_permission(), object=result):
+            return
+        cl.result_count = cl.result_count +1
-    for field_name in cl.lookup_opts.admin.list_display:
-        row_class = ''

django/branches/per-object-permissions/django/contrib/admin/views/main.py

@@ -434 +434 @@
-                if related.opts.admin:
-                    p = '%s.%s' % (related.opts.app_label, related.opts.get_delete_permission())
-
+, object=related
-                        perms_needed.add(related.opts.verbose_name)
-                        # We don't care about populating deleted_objects now.
@@ -465 +465 @@
-            if related.opts.admin and has_related_objs:
-                p = '%s.%s' % (related.opts.app_label, related.opts.get_delete_permission())
-
+, object=related
-                    perms_needed.add(rel_opts_name)
-    for related in opts.get_all_related_many_to_many_objects():
@@ -494 +494 @@
-        if related.opts.admin and has_related_objs:
-            p = '%s.%s' % (related.opts.app_label, related.opts.get_change_permission())
-
+, object=related
-                perms_needed.add(related.opts.verbose_name)
-
@@ -563 +563 @@
-        self.lookup_opts = self.opts
-        self.manager = self.opts.admin.manager
+        self.user = request.user
-
-        # Get search parameters from the query string.
@@ -645 +646 @@
-                result_list = ()
-
-
+
+
+
+
-        self.full_result_count = full_result_count
-        self.result_list = result_list

django/branches/per-object-permissions/django/contrib/auth/models.py

@@ -374 +374 @@
-            backend.quote_name('negative'), backend.quote_name('owner_ct_id'),
-            backend.quote_name('model_ct_id'))
-print sql
+
-        cursor.execute(sql, [self.id, ContentType.objects.get_for_model(Group).id, ct.id])
-        count = int(cursor.fetchone()[0])

django/branches/per-object-permissions/django/db/models/options.py

@@ -204 +204 @@
-        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, 
-
+
+
-        self.fields = fields
-        self.js = js or []
@@ -220 +221 @@
-        self.grant_delete_row_level_perm=grant_delete_row_level_perm
-        self.hidden = hidden
+        self.show_all_rows = show_all_rows
-
-    def get_field_sets(self, opts):