New version of delete, which marks as delete instead of removing an

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

diff --git a/planetstack/core/models/plcorebase.py b/planetstack/core/models/plcorebase.py
index 9ce409d..fc8e740 100644 (file)
--- a/planetstack/core/models/plcorebase.py
+++ b/planetstack/core/models/plcorebase.py
@@ -18,6 +18,8 @@ except:
     def notify_observer(*args, **kwargs):
         pass
 
+# 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)
@@ -34,6 +36,8 @@ class PlCoreBase(models.Model):
     deleted = models.BooleanField(default=False)
 
     class Meta:
+        # Changing abstract to False would require the managers of subclasses of
+        # PlCoreBase to be customized individually.
         abstract = True
         app_label = "core"
 
@@ -68,20 +72,17 @@ class PlCoreBase(models.Model):
 
     def delete(self, *args, **kwds):
         # so we have something to give the observer
-        pk = self.pk
-        model_dict = model_to_dict(self)
-        for (k,v) in model_dict.items():
-            # things like datetime are not JSON serializable
-            model_dict[k] = str(v)
+        if (observer_disabled):
+            super(PlCoreBase, self).delete(*args, **kwargs)
+        else:
+            self.deleted = True
+            self.enacted=None
+            self.save(update_fields=['enacted','deleted'])
 
-        super(PlCoreBase, self).delete(*args, **kwds)
-
-        # This is a no-op if observer_disabled is set
-        notify_observer(model=self, delete=True, pk=pk, model_dict=model_dict)
 
     def save(self, *args, **kwargs):
         super(PlCoreBase, self).save(*args, **kwargs)
-        
+
         # This is a no-op if observer_disabled is set
         notify_observer()