Added list of ephemeral models to be autodeleted
authorSapan Bhatia <sapanb@cs.princeton.edu>
Wed, 12 Nov 2014 15:38:23 +0000 (10:38 -0500)
committerSapan Bhatia <sapanb@cs.princeton.edu>
Wed, 12 Nov 2014 15:38:23 +0000 (10:38 -0500)
planetstack/core/models/plcorebase.py
planetstack/dependency_walker.py

index 782737c..612e925 100644 (file)
@@ -7,6 +7,7 @@ from django.forms.models import model_to_dict
 from django.utils import timezone
 from django.core.exceptions import PermissionDenied
 import model_policy
+from model_autodeletion import ephemeral_models
 
 try:
     # This is a no-op if observer_disabled is set to 1 in the config file
@@ -203,7 +204,7 @@ class PlCoreBase(models.Model): # , DiffModelMixIn):
 
     @classmethod
     def is_ephemeral(cls):
-       return False
+       return cls in ephemeral_models
 
 
 
index ca1959e..93e1847 100755 (executable)
@@ -79,6 +79,7 @@ def __walk_deps(fn, object, deps):
 
                        for o in peer_objects:
                                fn(o, object)
+                               # Uncomment the following line to enable recursion
                                # walk_inv_deps(fn, o)
 
 def p(x):