Ticket #6117: admin_log.2.diff

django/contrib/admin/options.py

@@ -408 +408 @@
         
         `formsets` is a sequence of InlineFormSet instances that are verified to be valid.
         """
+        def diff(obj, dict_):
+            added, changed, removed = [], [], []
+            fields = [f.name for f in obj._meta.fields]
+            for key in dict_.keys():
+                if key in fields:
+                    if dict_[key] is None and getattr(obj, key) is not None:
+                        removed.append(key)
+                    elif dict_[key] is not None and getattr(obj, key) is None:
+                        added.append(key)
+                    elif dict_[key] != getattr(obj, key):
+                        changed.append(key)
+            return added, changed, removed
+
         from django.contrib.admin.models import LogEntry, CHANGE
         from django.contrib.contenttypes.models import ContentType
         opts = model._meta
@@ -417 +430 @@
         if formsets:
             for formset in formsets:
                 formset.save()
-
+        added, changed, removed = diff(new_object, form.cleaned_data)
         # Construct the change message. TODO: Temporarily commented-out,
         # as manipulator object doesn't exist anymore, and we don't yet
         # have a way to get fields_added, fields_changed, fields_deleted.
         change_message = []
-        #if manipulator.fields_added:
-            #change_message.append(_('Added %s.') % get_text_list(manipulator.fields_added, _('and')))
-        #if manipulator.fields_changed:
-            #change_message.append(_('Changed %s.') % get_text_list(manipulator.fields_changed, _('and')))
-        #if manipulator.fields_deleted:
-            #change_message.append(_('Deleted %s.') % get_text_list(manipulator.fields_deleted, _('and')))
-        #change_message = ' '.join(change_message)
+        if added:
+            change_message.append(_('Added %s.') % ' and '.join(added))
+        if changed:
+            change_message.append(_('Changed %s.') % ' and '.join(changed))
+        if removed:
+            change_message.append(_('Deleted %s.') % ' and '.join(removed))
+        change_message = ' '.join(change_message)
         if not change_message:
             change_message = _('No fields changed.')
         LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(model).id, pk_value, force_unicode(new_object), CHANGE, change_message)