Changeset 3895

Timestamp:

10/03/06 13:11:02 (2 years ago)

Author:

clong

Message:

[per-object-permissions] Sets the row level permisisons on objects created inline if the inline objects have row level permissions enabled. This has not been tested indepth, and might not work 100%

Files:

• django/branches/per-object-permissions/django/contrib/admin/views/main.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/db/models/manipulators.py (modified) (3 diffs)

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

@@ -265 +265 @@
-                                                                          delete=admin_opts.grant_delete_row_level_perm)
-            
+            for rel_obj in manipulator.new_rel_objs:
+                if rel_obj._meta.row_level_permissions:
+                    from django.contrib.auth.models import RowLevelPermission
+                    admin_opts = rel_obj._meta.admin
+                    RowLevelPermission.objects.create_default_row_permissions(rel_obj, request.user, 
+                                                                              change=admin_opts.grant_change_row_level_perm,
+                                                                              delete=admin_opts.grant_delete_row_level_perm)
-            # Here, we distinguish between different save types by checking for
-            # the presence of keys in request.POST.
@@ -353 +360 @@
-                change_message = _('No fields changed.')
-            LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(model).id, pk_value, str(new_object), CHANGE, change_message)
+
+            for rel_obj in manipulator.new_rel_objs:
+                if rel_obj._meta.row_level_permissions:
+                    from django.contrib.auth.models import RowLevelPermission
+                    admin_opts = rel_obj._meta.admin
+                    RowLevelPermission.objects.create_default_row_permissions(rel_obj, request.user, 
+                                                                              change=admin_opts.grant_change_row_level_perm,
+                                                                              delete=admin_opts.grant_delete_row_level_perm)
-
-            msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': opts.verbose_name, 'obj': new_object}

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

@@ -130 +130 @@
-
-        expanded_data = DotExpandedDict(dict(new_data))
+        self.new_rel_objs = []
-        # Save many-to-one objects. Example: Add the Choice objects for a Poll.
-        for related in self.opts.get_all_related_objects():
@@ -208 +209 @@
-                            if not old_rel_obj: # This object didn't exist before.
-                                self.fields_added.append('%s "%s"' % (related.opts.verbose_name, new_rel_obj))
+                                self.new_rel_objs.append(new_rel_obj)
-                            else:
-                                for f in related.opts.fields:
@@ -225 +227 @@
-                        new_rel_obj.delete()
-                        self.fields_deleted.append('%s "%s"' % (related.opts.verbose_name, old_rel_obj))
+
-
-        # Save the order, if applicable.