mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-24 06:48:35 +02:00
Added redis on docker, simplified changes to message_limit
This commit is contained in:
@@ -152,9 +152,6 @@ class MailboxSerializer(serializers.ModelSerializer):
|
||||
quota = serializers.CharField(required=False)
|
||||
quota_usage = serializers.SerializerMethodField()
|
||||
|
||||
message_limit = serializers.CharField(
|
||||
required=False, allow_null=True, allow_blank=True)
|
||||
|
||||
class Meta:
|
||||
model = models.Mailbox
|
||||
fields = (
|
||||
@@ -169,14 +166,6 @@ class MailboxSerializer(serializers.ModelSerializer):
|
||||
"""Lower case address."""
|
||||
return value.lower()
|
||||
|
||||
def validate_message_limit(self, value):
|
||||
if not value:
|
||||
return None
|
||||
try:
|
||||
return int(value)
|
||||
except ValueError:
|
||||
raise ValidationError(_("A valid integer is required."))
|
||||
|
||||
def validate_quota(self, value):
|
||||
"""Convert quota to MB."""
|
||||
return web_utils.size2integer(value, output_unit="MB")
|
||||
|
||||
@@ -389,9 +389,6 @@ class MailboxSerializer(serializers.ModelSerializer):
|
||||
|
||||
quota = serializers.CharField(required=False)
|
||||
|
||||
message_limit = serializers.CharField(
|
||||
required=False, allow_null=True, allow_blank=True)
|
||||
|
||||
class Meta:
|
||||
model = models.Mailbox
|
||||
fields = (
|
||||
@@ -402,14 +399,6 @@ class MailboxSerializer(serializers.ModelSerializer):
|
||||
"""Convert quota to MB."""
|
||||
return web_utils.size2integer(value, output_unit="MB")
|
||||
|
||||
def validate_message_limit(self, value):
|
||||
if value == "":
|
||||
return None
|
||||
try:
|
||||
return int(value)
|
||||
except ValueError:
|
||||
raise ValidationError(_("A valid integer is required."))
|
||||
|
||||
def validate(self, data):
|
||||
"""Check if quota is required."""
|
||||
method = self.context["request"].method
|
||||
|
||||
Reference in New Issue
Block a user