fix mailbox.nb_alias(): take into account multiple mailboxes per alias case
This commit is contained in:
parent
f852bc508b
commit
acac06188c
|
@ -1323,7 +1323,10 @@ class Mailbox(db.Model, ModelMixin):
|
||||||
__table_args__ = (db.UniqueConstraint("user_id", "email", name="uq_mailbox_user"),)
|
__table_args__ = (db.UniqueConstraint("user_id", "email", name="uq_mailbox_user"),)
|
||||||
|
|
||||||
def nb_alias(self):
|
def nb_alias(self):
|
||||||
return Alias.filter_by(mailbox_id=self.id).count()
|
return (
|
||||||
|
AliasMailbox.filter_by(mailbox_id=self.id).count()
|
||||||
|
+ Alias.filter_by(mailbox_id=self.id).count()
|
||||||
|
)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def delete(cls, obj_id):
|
def delete(cls, obj_id):
|
||||||
|
@ -1405,6 +1408,8 @@ class Referral(db.Model, ModelMixin):
|
||||||
|
|
||||||
code = db.Column(db.String(128), unique=True, nullable=False)
|
code = db.Column(db.String(128), unique=True, nullable=False)
|
||||||
|
|
||||||
|
user = db.relationship(User, foreign_keys=[user_id])
|
||||||
|
|
||||||
def nb_user(self):
|
def nb_user(self):
|
||||||
return User.filter_by(referral_id=self.id, activated=True).count()
|
return User.filter_by(referral_id=self.id, activated=True).count()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue