Ticket #1132: current_user_field_patch.diff

django/contrib/admin/views/main.py

@@ -405 +405 @@
         manipulator.do_html2python(new_data)
 
         if not errors and not request.POST.has_key("_preview"):
-            new_object = manipulator.save(new_data)
+            new_object = manipulator.save(new_data, current_user=request.user.id)
             log_add_message(request.user, opts,manipulator,new_object)
             msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name':opts.verbose_name, 'obj':new_object}
             pk_value = getattr(new_object,opts.pk.attname)
@@ -484 +484 @@
 
         manipulator.do_html2python(new_data)
         if not errors and not request.POST.has_key("_preview"):
-            new_object = manipulator.save(new_data)
+            new_object = manipulator.save(new_data, current_user=request.user.id)
             log_change_message(request.user,opts,manipulator,new_object)
             msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': opts.verbose_name, 'obj':new_object}
             pk_value = getattr(new_object,opts.pk.attname)

django/core/meta/fields.py

@@ -741 +741 @@
                     return {self.attname: choice_list[1][0]}
         return Field.flatten_data(self, follow, obj)
 
+class CurrentUserField(ForeignKey):
+    def __init__(self, to=None, update_on_edit=True, **kwargs):
+        self.update_on_edit = update_on_edit
+        if to is None:
+            from django.models.auth.users import User
+            to = User
+        # TODO: should these be overridable? I can't think of a reason why
+        # it would be necessary to do so.
+        kwargs['blank'] = True
+        kwargs['null'] = True
+        kwargs['editable'] = False
+        ForeignKey.__init__(self, to, **kwargs)
+
 class ManyToManyField(Field):
     def __init__(self, to, **kwargs):
         kwargs['verbose_name'] = kwargs.get('verbose_name', to._meta.verbose_name_plural)

django/core/meta/__init__.py

@@ -1750 +1750 @@
     if change and opts.get_ordered_objects():
         self.fields.append(formfields.CommaSeparatedIntegerField(field_name="order_"))
 
-def manipulator_save(opts, klass, add, change, self, new_data):
+def manipulator_save(opts, klass, add, change, self, new_data, current_user=None):
     # TODO: big cleanup when core fields go -> use recursive manipulators.
     from django.utils.datastructures import DotExpandedDict
     params = {}
@@ -1759 +1759 @@
         auto_now_add = change and getattr(f, 'auto_now_add', False)
         if self.follow.get(f.name, None) and not auto_now_add:
             param = f.get_manipulator_new_data(new_data)
+        # CurrentUserFields need to be set to the current user
+        elif isinstance(f, CurrentUserField):
+            # Only update this field if f.update_on_edit is True or we are in add_stage.
+            if f.update_on_edit or add:
+                param = current_user
+            else:
+                param = getattr(self.original_object, f.attname)
         else:
             if change:
                 param = getattr(self.original_object, f.attname)