git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7918f04
)
observer_disabled was not being imported into core/models/user.py
author
Scott Baker
<smbaker@gmail.com>
Thu, 9 Oct 2014 23:16:02 +0000
(16:16 -0700)
committer
Scott Baker
<smbaker@gmail.com>
Thu, 9 Oct 2014 23:16:02 +0000
(16:16 -0700)
planetstack/core/models/user.py
patch
|
blob
|
history
diff --git
a/planetstack/core/models/user.py
b/planetstack/core/models/user.py
index
5a73ad7
..
1b3be29
100644
(file)
--- a/
planetstack/core/models/user.py
+++ b/
planetstack/core/models/user.py
@@
-13,6
+13,20
@@
from core.middleware import get_request
import model_policy
from django.core.exceptions import PermissionDenied
import model_policy
from django.core.exceptions import PermissionDenied
+# ------ from plcorebase.py ------
+try:
+ # This is a no-op if observer_disabled is set to 1 in the config file
+ from observer import *
+except:
+ print >> sys.stderr, "import of observer failed! printing traceback and disabling observer:"
+ import traceback
+ traceback.print_exc()
+
+ # guard against something failing
+ def notify_observer(*args, **kwargs):
+ pass
+# ------ ------
+
# Create your models here.
class UserManager(BaseUserManager):
def create_user(self, email, firstname, lastname, password=None):
# Create your models here.
class UserManager(BaseUserManager):
def create_user(self, email, firstname, lastname, password=None):