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:
86fd8a3
)
Deployment is imported out of Site.
author
Sapan Bhatia
<gwsapan@gmail.com>
Wed, 11 Jun 2014 21:10:11 +0000
(17:10 -0400)
committer
Sapan Bhatia
<gwsapan@gmail.com>
Wed, 11 Jun 2014 21:10:11 +0000
(17:10 -0400)
planetstack/core/models/user.py
patch
|
blob
|
history
diff --git
a/planetstack/core/models/user.py
b/planetstack/core/models/user.py
index
6e7eef6
..
a74ba78
100644
(file)
--- a/
planetstack/core/models/user.py
+++ b/
planetstack/core/models/user.py
@@
-4,7
+4,7
@@
from collections import defaultdict
from django.db import models
from django.db.models import F, Q
from core.models import PlCoreBase,Site, DashboardView
-from core.models.
deployment
import Deployment
+from core.models.
site
import Deployment
from django.contrib.auth.models import AbstractBaseUser, BaseUserManager
from timezones.fields import TimeZoneField
from operator import itemgetter, attrgetter