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 
* Removed save_last_revision()
* signal.pre_delete now uses save_new_revision()
* Added "signal_name" check and "pre_delete" processingto save_new_revision()
* Fixed BUG from [3588]



git-svn-id: http://code.djangoproject.com/svn/django/branches/full-history@3596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Uroš Trebec 2006-08-16 12:57:20 +00:00
parent a064d0848b
commit fd837f0235
1 changed files with 8 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,6 +110,7 @@ def _import_models(instance):
def save_new_revision(sender, instance, signal, *args, **kwargs): 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
print "Signal: ",kwargs['signal_name']
if instance.__class__.__name__ is 'ChangeLog' or 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."
@ -123,7 +124,11 @@ def save_new_revision(sender, instance, signal, *args, **kwargs):
if _import_models(instance): if _import_models(instance):
try: try:
if instance.id: if kwargs['signal_name'] is 'pre_delete':
old = instance
log = ChangeLog(parent=instance, comment="Object deleted. Last revision.")
print "Log created."
elif kwargs['signal_name'] is 'pre_save' and instance.id:
old = getattr(m, model['name']).objects.filter(pk=instance.id)[0] old = getattr(m, model['name']).objects.filter(pk=instance.id)[0]
log = ChangeLog(parent=instance, comment="Update") log = ChangeLog(parent=instance, comment="Update")
print "Instance has an ID." print "Instance has an ID."
@ -142,7 +147,7 @@ def save_new_revision(sender, instance, signal, *args, **kwargs):
print "Old: ",old print "Old: ",old
print "Instance: ",instance.id print "Instance: ",instance.id
#print "Test: ",getattr(instance, 'Admin').date_hierarchy #print "Test: ",getattr(instance, 'Admin').date_hierarchy
print "Log: ",log print "Log: ",log.change_time
log.object = Pickle.dumps(old, protocol=0) log.object = Pickle.dumps(old, protocol=0)
log.save() log.save()
@ -150,38 +155,4 @@ def save_new_revision(sender, instance, signal, *args, **kwargs):
print "New change saved." print "New change saved."
dispatcher.connect( save_new_revision, signal=signals.pre_save ) dispatcher.connect( save_new_revision, signal=signals.pre_save )
dispatcher.connect( save_new_revision, signal=signals.pre_delete )
###########################
# Pre-delete signal catch #
###########################
def save_last_revision(sender, instance, signal, *args, **kwargs):
""" Saves the last copy of the record when the record is deleted."""
print "Sender: ",sender
if instance.__class__.__name__ is 'ChangeLog' or not hasattr(instance, 'History'):
print "Not history-enabled class."
return 0
#instance_name = instance.__class__.__name__
#print instance_name
m = None
old = None
log = None
if _import_models(instance):
try:
old = instance
log = ChangeLog(parent=instance, comment="Object deleted. Last revision.")
print "Log created."
except:
return 1
try:
log.object = Pickle.dumps(old, protocol=0)
log.save()
print "Last change saved."
except:
print "Failed!"
dispatcher.connect( save_last_revision, signal=signals.pre_delete )