projects
/
xnet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move xnet/accounts to xnet/groups
[xnet]
/
xnet
/
lists
/
base.py
diff --git
a/xnet/lists/base.py
b/xnet/lists/base.py
index
007eced
..
22bfaaf
100644
(file)
--- a/
xnet/lists/base.py
+++ b/
xnet/lists/base.py
@@
-5,7
+5,7
@@
import functools
from MailMan import UserDesc as mailman_userdesc
from MailMan import MailList as mailman_mlist
from MailMan import UserDesc as mailman_userdesc
from MailMan import MailList as mailman_mlist
-from
accounts import models as account
s_models
+from
groups import models as group
s_models
class ListError(Exception):
class ListError(Exception):
@@
-23,7
+23,7
@@
class InvalidOperation(ListError):
def is_mlist_admin(mlist, user):
if user.is_superuser or user in mlist.owner:
return True
def is_mlist_admin(mlist, user):
if user.is_superuser or user in mlist.owner:
return True
- if user.memberships.filter(group__dns=self.domain, level=
account
s_models.Membership.LEVEL_ADMIN).exists():
+ if user.memberships.filter(group__dns=self.domain, level=
group
s_models.Membership.LEVEL_ADMIN).exists():
return True
return False
return True
return False
@@
-88,8
+88,8
@@
class MailingList(object):
@property
def group(self):
try:
@property
def group(self):
try:
- return
account
s_models.XGroup.objects.get(dns=self.domain)
- except
account
s_models.XGroup.DoesNotExist:
+ return
group
s_models.XGroup.objects.get(dns=self.domain)
+ except
group
s_models.XGroup.DoesNotExist:
return None
# MailMan interactions
return None
# MailMan interactions