Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi

[plstackapi.git] / planetstack / core / models / plcorebase.py

diff --git a/planetstack/core/models/plcorebase.py b/planetstack/core/models/plcorebase.py
index 51240ad..4ac60b3 100644 (file)
--- a/planetstack/core/models/plcorebase.py
+++ b/planetstack/core/models/plcorebase.py
@@ -5,6 +5,7 @@ from django.db import models
 from django.forms.models import model_to_dict
 from django.core.urlresolvers import reverse
 from django.forms.models import model_to_dict
+import model_policies
 
 try:
     # This is a no-op if observer_disabled is set to 1 in the config file
@@ -18,16 +19,24 @@ except:
     def notify_observer(*args, **kwargs):
         pass
 
+# This manager will be inherited by all subclasses because
+# the core model is abstract.
+class PlCoreBaseDeletionManager(models.Manager):
+    def get_query_set(self):
+        return super(PlCoreBaseDeletionManager, self).get_query_set().filter(deleted=True)
+
 # This manager will be inherited by all subclasses because
 # the core model is abstract.
 class PlCoreBaseManager(models.Manager):
     def get_query_set(self):
         return super(PlCoreBaseManager, self).get_query_set().filter(deleted=False)
 
-    # default values for created and updated are only there to keep evolution
-    # from failing.
 class PlCoreBase(models.Model):
     objects = PlCoreBaseManager()
+    deleted_objects = PlCoreBaseDeletionManager()
+
+    # default values for created and updated are only there to keep evolution
+    # from failing.
     created = models.DateTimeField(auto_now_add=True, default=datetime.datetime.now())
     updated = models.DateTimeField(auto_now=True, default=datetime.datetime.now())
     enacted = models.DateTimeField(null=True, default=None)
@@ -72,9 +81,15 @@ class PlCoreBase(models.Model):
 
     def delete(self, *args, **kwds):
         # so we have something to give the observer
-        purge = kwds.get('purge',True)
-        if (observer_disabled or purge):
-            super(PlCoreBase, self).delete(*args, **kwargs)
+        purge = kwds.get('purge',False)
+        try:
+            purge = purge or observer_disabled
+        except NameError:
+            pass
+            
+        if (purge):
+            del kwds['purge']
+            super(PlCoreBase, self).delete(*args, **kwds)
         else:
             self.deleted = True
             self.enacted=None