self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-11-23 22:04:47 +02:00
Code Issues Releases Activity

Implement some basic views for podop

Browse Source
This commit is contained in:
kaiyou
2018-09-26 00:14:46 +02:00
parent 39cd0d5034
commit 7143fb8c47
3 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/admin/mailu/models.py
View File

@@ -268,7 +268,7 @@ class User(Base, Email):
@property
def destination(self):
if self.foward_enabled:
if self.forward_enabled:
result = self.self.forward_destination
if self.forward_keep:
result += ',' + self.email
@@ -339,13 +339,13 @@ class Alias(Base, Email):
@classmethod
def resolve(cls, localpart, domain_name):
return cls.query.filter(
sqlalchemy._and(cls.domain_name == domain_name,
sqlalchemy._or(
sqlalchemy.and_(cls.domain_name == domain_name,
sqlalchemy.or_(
cls.localpart == localpart,
cls.wildcard.like(localpart)
)
)
)
).first()
class Token(Base):