Changeset 3588

Timestamp:

08/14/06 18:28:23 (2 years ago)

Author:

utrebec

Message:

[full-history]
* Added save_last_revision() for when the record is deleted.
* Renamed _get_enabled_models() to _import_models()
* Moved the "import" stuff to _import_models() so it can be used everywhere
* Added "pre-delete signal" connect
* BUG: save_new_revision() stopped working (EOFError on line 42 - get_object() function).

Files:

• django/branches/full-history/django/contrib/history/models.py (modified) (4 diffs)

django/branches/full-history/django/contrib/history/models.py

@@ -84 +84 @@
-#########################
-
-get_enabled_models(
+import_models(instance
-    """ Returns a list of History-enabled models. """
-    model_list = []
+    m = None
+
-    for model in models.get_models():
-        try:
@@ -94 +96 @@
-        except:
-            pass
-
+
+
+
+
+
+
+
+
+
+
+
-
-def save_new_revision(sender, instance, signal, *args, **kwargs):
@@ -109 +121 @@
-    old = None
-    log = None
-
-    for model in _get_enabled_models():
-        if model['name'] is instance.__class__.__name__:
-            try:
-                m = __import__(model['module'], '', '', [model['name']])
-                #print model['module'],": ",model['name'],"- ",m
-                print "Model import done: ",m
-            except:
-                print "Model import error."
-    
-m
+_import_models(instance)
-        try:
-            if instance.id:
@@ -136 +139 @@
-        return 0  # exit wo/ an action
-
-
+
-    print "Old: ",old
-    print "Instance: ",instance.id
-    #print "Test: ",getattr(instance, 'Admin').date_hierarchy
-    print "Log: ",log
+
-    log.object = Pickle.dumps(old, protocol=0)
-    log.save()
+
-    print "New change saved."
-    
-
-dispatcher.connect( save_new_revision, signal=signals.pre_save )
+    
+###########################
+# 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 )