Changes between Version 18 and Version 19 of AuditTrail

Timestamp:

Dec 6, 2008, 1:03:08 PM (16 years ago)

Author:

Jeff Kowalczyk

Comment:

Update AuditTrail(show_in_admin=True), default ModelAdmin support for Django-1.0.x. Put python shebangs back, didn't know they triggered syntax coloring in Trac.

AuditTrail

@@ -10 +10 @@
 
 {{{
+#!python
 from django.db import models
 import audit
@@ -63 +64 @@
 
 {{{
+#!python
 def some_callback(instance):
     return `random.randrange(1, 99)` + 'trackable_val'
@@ -81 +83 @@
 
 {{{
+#!python
 >>> p_hist = person.history.all()
 [<PersonAudit: John Public as of 2007-08-27 09:29:14>, <PersonAudit: John Public as of 2007-08-27 09:28:57>]
@@ -96 +99 @@
 
 {{{
+#!python
 from django.db import models
 
@@ -132 +136 @@
 from django.db import models
 from django.core.exceptions import ImproperlyConfigured
+from django.contrib import admin
 import copy
 import re
@@ -139 +144 @@
 except ImportError:
     settings_audit = None
-
 value_error_re = re.compile("^.+'(.+)'$")
 
@@ -158 +162 @@
         def _contribute(sender, **kwargs):
             model = create_audit_model(sender, **self.opts)
+            if self.opts['show_in_admin']:
+                # Enable admin integration
+                # If ModelAdmin needs options or different base class, find
+                # some way to make the commented code work
+                #   cls_admin_name = cls.__name__ + 'Admin'
+                #   clsAdmin = type(cls_admin_name, (admin.ModelAdmin,),{})
+                #   admin.site.register(cls, clsAdmin)
+                # Otherwise, register class with default ModelAdmin
+                admin.site.register(model)
             descriptor = AuditTrailDescriptor(model._default_manager, sender._meta.pk.attname)
             setattr(sender, name, descriptor)
@@ -269 +282 @@
         attrs['_audit_change_type'] = models.CharField(max_length=1)
 
-    if 'show_in_admin' in kwargs and kwargs['show_in_admin']:
-        # Enable admin integration
-        class Admin:
-            pass
-        attrs['Admin'] = Admin
-
     # Copy the fields from the existing model to the audit model
     for field in cls._meta.fields:
@@ -320 +327 @@
                 tracks_found.append(track_item)
             else:
-
                 tracks_found.append(_build_track_field(track_item))