git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
also allow 'silent' to be set as an instance variable
[plstackapi.git]
/
planetstack
/
core
/
models
/
plcorebase.py
diff --git
a/planetstack/core/models/plcorebase.py
b/planetstack/core/models/plcorebase.py
index
d1784cd
..
8d657a7
100644
(file)
--- a/
planetstack/core/models/plcorebase.py
+++ b/
planetstack/core/models/plcorebase.py
@@
-1,10
+1,10
@@
-import datetime
import os
import sys
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 os
import sys
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
+from django.utils import timezone
import model_policy
try:
import model_policy
try:
@@
-23,9
+23,13
@@
except:
# the core model is abstract.
class PlCoreBaseDeletionManager(models.Manager):
def get_queryset(self):
# the core model is abstract.
class PlCoreBaseDeletionManager(models.Manager):
def get_queryset(self):
- return super(PlCoreBaseDeletionManager, self).get_query_set().filter(deleted=True)
+ parent=super(PlCoreBaseDeletionManager, self)
+ if hasattr(parent, "get_queryset"):
+ return parent.get_queryset().filter(deleted=True)
+ else:
+ return parent.get_query_set().filter(deleted=True)
- # deprecated in django 1.7 in favor of get_queryset()
+ # deprecated in django 1.7 in favor of get_queryset()
.
def get_query_set(self):
return self.get_queryset()
def get_query_set(self):
return self.get_queryset()
@@
-33,9
+37,13
@@
class PlCoreBaseDeletionManager(models.Manager):
# the core model is abstract.
class PlCoreBaseManager(models.Manager):
def get_queryset(self):
# the core model is abstract.
class PlCoreBaseManager(models.Manager):
def get_queryset(self):
- return super(PlCoreBaseManager, self).get_query_set().filter(deleted=False)
+ parent=super(PlCoreBaseManager, self)
+ if hasattr(parent, "get_queryset"):
+ return parent.get_queryset().filter(deleted=False)
+ else:
+ return parent.get_query_set().filter(deleted=False)
- # deprecated in django 1.7 in favor of get_queryset()
+ # deprecated in django 1.7 in favor of get_queryset()
.
def get_query_set(self):
return self.get_queryset()
def get_query_set(self):
return self.get_queryset()
@@
-45,8
+53,8
@@
class PlCoreBase(models.Model):
# default values for created and updated are only there to keep evolution
# from failing.
# default values for created and updated are only there to keep evolution
# from failing.
- created = models.DateTimeField(auto_now_add=True, default=
datetime.datetim
e.now)
- updated = models.DateTimeField(auto_now=True, default=
datetime.datetim
e.now)
+ created = models.DateTimeField(auto_now_add=True, default=
timezon
e.now)
+ updated = models.DateTimeField(auto_now=True, default=
timezon
e.now)
enacted = models.DateTimeField(null=True, default=None)
backend_status = models.CharField(max_length=140,
default="Provisioning in progress")
enacted = models.DateTimeField(null=True, default=None)
backend_status = models.CharField(max_length=140,
default="Provisioning in progress")
@@
-61,6
+69,7
@@
class PlCoreBase(models.Model):
def __init__(self, *args, **kwargs):
super(PlCoreBase, self).__init__(*args, **kwargs)
self.__initial = self._dict
def __init__(self, *args, **kwargs):
super(PlCoreBase, self).__init__(*args, **kwargs)
self.__initial = self._dict
+ self.silent = False
@property
def diff(self):
@property
def diff(self):
@@
-90,25
+99,31
@@
class PlCoreBase(models.Model):
def delete(self, *args, **kwds):
# so we have something to give the observer
purge = kwds.get('purge',False)
def delete(self, *args, **kwds):
# so we have something to give the observer
purge = kwds.get('purge',False)
+ silent = kwds.get('silent',False)
try:
purge = purge or observer_disabled
except NameError:
pass
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
if (purge):
del kwds['purge']
super(PlCoreBase, self).delete(*args, **kwds)
else:
self.deleted = True
self.enacted=None
- self.save(update_fields=['enacted','deleted'])
-
+ self.save(update_fields=['enacted','deleted'], silent=silent)
def save(self, *args, **kwargs):
def save(self, *args, **kwargs):
+ # let the user specify silence as either a kwarg or an instance varible
+ silent = self.silent
+ if "silent" in kwargs:
+ silent=silent or kwargs.pop("silent")
+
super(PlCoreBase, self).save(*args, **kwargs)
# This is a no-op if observer_disabled is set
super(PlCoreBase, self).save(*args, **kwargs)
# This is a no-op if observer_disabled is set
- notify_observer()
+ if not silent:
+ notify_observer()
self.__initial = self._dict
self.__initial = self._dict