mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity

[full-history]

Browse Source 
* Added __str__ + changed Admin list_display to use it
* Added extra checking for History-enabled
* Added extra checking of instance "type" (new/update) - Fixed saving
* Using signals.pre_save again (if instance is "new" then it uses ID=0)



git-svn-id: http://code.djangoproject.com/svn/django/branches/full-history@3579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Uroš Trebec 2006-08-14 00:10:10 +00:00
parent 98120e36c3
commit b1f4974bef
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
django/contrib/history/models.py
View File

@ -11,14 +11,12 @@ from datetime import datetime
class ChangeLog(models.Model): class ChangeLog(models.Model):
change_time = models.DateTimeField (_('time of change'), auto_now=True) change_time = models.DateTimeField (_('time of change'), auto_now=True)
content_type = models.ForeignKey(ContentType) content_type = models.ForeignKey(ContentType)
parent = models.GenericForeignKey() parent = models.GenericForeignKey()
object_id = models.IntegerField(_('object ID')) object_id = models.IntegerField(_('object ID'))
user = models.ForeignKey(User, default="1") user = models.ForeignKey(User, default="1")
object = models.TextField() object = models.TextField()
comment = models.CharField(maxlength=250, default="Bla") comment = models.CharField(maxlength=250, blank=True)
#object_type = models.CharField(maxlength=50) #object_type = models.CharField(maxlength=50)
#pub_date = models.DateTimeField('date published') #pub_date = models.DateTimeField('date published')
@ -34,7 +32,10 @@ class ChangeLog(models.Model):
('Object', {'fields': ('object',),}), ('Object', {'fields': ('object',),}),
) )
list_display = ('object_id', 'user', 'comment', 'content_type', 'change_time', ) list_display = ('__str__', 'user', 'comment', 'content_type', 'change_time', )
def __str__(self):
return str(self.get_object())
def get_object(self): def get_object(self):
""" Returns unpickled object. """ """ Returns unpickled object. """
@ -98,7 +99,7 @@ def save_new_revision(sender, instance, signal, *args, **kwargs):
""" Saves a old copy of the record into the History table.""" """ Saves a old copy of the record into the History table."""
print "Sender: ",sender print "Sender: ",sender
if not hasattr(instance, 'History'): if instance.__class__.__name__ is 'ChangeLog' or not hasattr(instance, 'History'):
print "Not history-enabled class." print "Not history-enabled class."
return 0 return 0
@ -113,25 +114,35 @@ def save_new_revision(sender, instance, signal, *args, **kwargs):
try: try:
m = __import__(model['module'], '', '', [model['name']]) m = __import__(model['module'], '', '', [model['name']])
#print model['module'],": ",model['name'],"- ",m #print model['module'],": ",model['name'],"- ",m
print "Model import done: ",m
except: except:
print "Model import error." print "Model import error."
if m: if m:
try: try:
old = getattr(m, model['name']).objects.filter(pk=instance.id) if instance.id:
old = getattr(m, model['name']).objects.filter(pk=instance.id)[0]
log = ChangeLog(parent=instance, comment="Update") log = ChangeLog(parent=instance, comment="Update")
except: print "Instance has an ID."
old = instance
log = ChangeLog(parent=instance, comment="New")
else: else:
return 0 print "Enter except."
old = instance
instance.id = 0 # FIX: ID cannot be None
log = ChangeLog(parent=instance, comment="New")
print "Instance without an ID."
except:
return 1
else:
return 0 # exit wo/ an action
print "Old: ",old print "Old: ",old
print "Instance: ",instance.id print "Instance: ",instance.id
#print "Test: ",getattr(instance, 'Admin').date_hierarchy
print "Log: ",log print "Log: ",log
log.object = Pickle.dumps(old[0], protocol=0) log.object = Pickle.dumps(old, protocol=0)
log.save() log.save()
print "New change saved." print "New change saved."
dispatcher.connect( save_new_revision, signal=signals.post_save ) dispatcher.connect( save_new_revision, signal=signals.pre_save )